summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-05-19 11:01:55 +0200
committerJules Laplace <julescarbon@gmail.com>2018-05-19 11:01:55 +0200
commit9288bffcfe9b6fef5ef76e0e11041444551b3b1f (patch)
tree57871dae0369adfae250d4e70be67f86f0fe1689
parent1becd9c95e714e61234adef30c2efa2519869ae4 (diff)
fix paths
-rw-r--r--test-mogrify-recursive.sh4
-rw-r--r--test-mogrify.py7
2 files changed, 6 insertions, 5 deletions
diff --git a/test-mogrify-recursive.sh b/test-mogrify-recursive.sh
index c4f4651..232894a 100644
--- a/test-mogrify-recursive.sh
+++ b/test-mogrify-recursive.sh
@@ -53,7 +53,7 @@ how_many=2000
--recursive --recursive-frac 0.1 \
--sequence --sequence-frac 0.3 \
--process-frac 0.5 \
- --transition-min 0.001 \
+ --transition-min 0.05 \
--how_many 10000 --transition-period 1000 \
--loadSize 256 --fineSize 256 \
--model test --which_model_netG unet_256 \
@@ -85,7 +85,7 @@ how_many=2000
--recursive --recursive-frac 0.1 \
--sequence --sequence-frac 0.3 \
--process-frac 0.5 \
- --transition-min 0.05 \
+ --transition-min 0.1 \
--how_many 10000 --transition-period 1000 \
--loadSize 256 --fineSize 256 \
--model test --which_model_netG unet_256 \
diff --git a/test-mogrify.py b/test-mogrify.py
index 68f279d..d01f530 100644
--- a/test-mogrify.py
+++ b/test-mogrify.py
@@ -205,10 +205,11 @@ if __name__ == '__main__':
if data_opt.sequence and A_dir is not None:
A_img = Image.open(sequence_path).convert('RGB')
A_im = np.asarray(A_img)
- t = lerp(math.sin(i / data_opt.transition_period * math.pi * 2 ) / 2 + 1, data_opt.transition_min, 1.0)
- frac_a = data_opt.recursive_frac * (1 - t)
- frac_b = data_opt.sequence_frac * (1 - t)
+ t = lerp(math.sin(i / data_opt.transition_period * math.pi * 2.0 ) / 2.0 + 1.0, data_opt.transition_min, 1.0)
+ frac_a = data_opt.recursive_frac * (1.0 - t)
+ frac_b = data_opt.sequence_frac * (1.0 - t)
frac_c = 1.0 - frac_a - frac_b
+ print("{}: {}".format(i, t))
array_a = np.multiply(last_im.astype('float64'), frac_a)
array_b = np.multiply(A_im.astype('float64'), frac_b)
array_c = np.multiply(im.astype('float64'), frac_c)