diff --git a/exps/LFNA/vis-synthetic.py b/exps/LFNA/vis-synthetic.py index 210d639..5b6ea93 100644 --- a/exps/LFNA/vis-synthetic.py +++ b/exps/LFNA/vis-synthetic.py @@ -179,11 +179,11 @@ def compare_cl(save_dir): ) -def visualize_env(save_dir): +def visualize_env(save_dir, version): save_dir = Path(str(save_dir)) save_dir.mkdir(parents=True, exist_ok=True) - dynamic_env = get_synthetic_env() + dynamic_env = get_synthetic_env(version=version) min_t, max_t = dynamic_env.min_timestamp, dynamic_env.max_timestamp for idx, (timestamp, (allx, ally)) in enumerate(tqdm(dynamic_env, ncols=50)): dpi, width, height = 30, 1800, 1400 @@ -201,11 +201,15 @@ def visualize_env(save_dir): tick.label.set_rotation(10) for tick in cur_ax.yaxis.get_major_ticks(): tick.label.set_fontsize(LabelSize - font_gap) - cur_ax.set_xlim(-10, 10) - cur_ax.set_ylim(-60, 60) + if version == "v1": + cur_ax.set_xlim(-2, 2) + cur_ax.set_ylim(-60, 60) + elif version == "v2": + cur_ax.set_xlim(-10, 10) + cur_ax.set_ylim(-60, 60) cur_ax.legend(loc=1, fontsize=LegendFontsize) - save_path = save_dir / "{:05d}".format(idx) + save_path = save_dir / "v{:}-{:05d}".format(version, idx) fig.savefig(str(save_path) + ".pdf", dpi=dpi, bbox_inches="tight", format="pdf") fig.savefig(str(save_path) + ".png", dpi=dpi, bbox_inches="tight", format="png") plt.close("all") @@ -213,8 +217,8 @@ def visualize_env(save_dir): base_cmd = "ffmpeg -y -i {xdir}/%05d.png -vf scale=1800:1400 -pix_fmt yuv420p -vb 5000k".format( xdir=save_dir ) - os.system("{:} {xdir}/env.mp4".format(base_cmd, xdir=save_dir)) - os.system("{:} {xdir}/env.webm".format(base_cmd, xdir=save_dir)) + os.system("{:} {xdir}/env-{ver}.mp4".format(base_cmd, xdir=save_dir, ver=version)) + os.system("{:} {xdir}/env-{ver}.webm".format(base_cmd, xdir=save_dir, ver=version)) def compare_algs(save_dir, alg_dir="./outputs/lfna-synthetic"): @@ -417,7 +421,8 @@ if __name__ == "__main__": ) args = parser.parse_args() - compare_algs_v2(os.path.join(args.save_dir, "compare-alg-v2")) - # visualize_env(os.path.join(args.save_dir, "vis-env")) + visualize_env(os.path.join(args.save_dir, "vis-env"), "v1") + visualize_env(os.path.join(args.save_dir, "vis-env"), "v2") + # compare_algs_v2(os.path.join(args.save_dir, "compare-alg-v2")) # compare_cl(os.path.join(args.save_dir, "compare-cl")) # compare_algs(os.path.join(args.save_dir, "compare-alg")) diff --git a/lib/datasets/synthetic_core.py b/lib/datasets/synthetic_core.py index 161f1d8..f05024b 100644 --- a/lib/datasets/synthetic_core.py +++ b/lib/datasets/synthetic_core.py @@ -29,6 +29,13 @@ def get_synthetic_env(total_timestamp=1000, num_per_task=1000, mode=None, versio ), ) if version == "v1": + function = DynamicLinearFunc() + function_param = dict() + function_param[0] = ComposedSinFunc( + amplitude_scale=ConstantFunc(1.0), period_phase_shift=ConstantFunc(10) + ) + function_param[1] = ConstantFunc(constant=0.9) + elif version == "v2": function = DynamicQuadraticFunc() function_param = dict() function_param[0] = ComposedSinFunc( @@ -38,13 +45,6 @@ def get_synthetic_env(total_timestamp=1000, num_per_task=1000, mode=None, versio function_param[2] = ComposedSinFunc( num_sin_phase=5, phase_shift=0.4, max_amplitude=0.9 ) - elif version == "v2": - function = DynamicLinearFunc() - function_param = dict() - function_param[0] = ComposedSinFunc( - amplitude_scale=ConstantFunc(1.0), period_phase_shift=ConstantFunc(1.0) - ) - function_param[1] = ConstantFunc(constant=0.9) else: raise ValueError("Unknown version: {:}".format(version))