Revert "defualt oracle_rate=0"

This reverts commit 98a091a7cb554ddefb1143b41f468e44e9d9ec74.

appendix/train_ukbench.sh

@@ -5,5 +5,5 @@ th convert_data.lua -data_dir ./data/ukbench
 #th train.lua -style photo -method noise -noise_level 2 -data_dir ./data/ukbench -model_dir models/ukbench -test images/lena.png -nr_rate 0.9 -jpeg_sampling_factors 420 # -thread 4 -backend cudnn 
 #th tools/cleanup_model.lua -model models/ukbench/noise2_model.t7 -oformat ascii
 
-th train.lua -method scale -oracle_rate 0.1 -data_dir ./data/ukbench -model_dir models/ukbench -test images/lena.jpg # -thread 4 -backend cudnn
+th train.lua -method scale -data_dir ./data/ukbench -model_dir models/ukbench -test images/lena.jpg # -thread 4 -backend cudnn
 th tools/cleanup_model.lua -model models/ukbench/scale2.0x_model.t7 -oformat ascii

appendix/train_upconv_7_art.sh

@@ -10,13 +10,13 @@ th train.lua -save_history 1 -scale 2 -model upconv_7 -method scale -model_dir m
 
 # noise_scale
 
-th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 0 -oracle_rate 0.1 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
-th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 1 -oracle_rate 0.1 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
-th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 2 -oracle_rate 0.1 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
-th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 3 -oracle_rate 0.1 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art -nr_rate 1
+th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 0 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
+th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 1 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
+th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 2 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art
+th train.lua -save_history 1 -model upconv_7 -method noise_scale -noise_level 3 -model_dir models/test/upconv_7_rev6 -downsampling_filters "Box,Sinc" -test query/noise_test.jpg -backend cudnn -thread 4  -resume models/test/upconv_7_rev5/scale2.0x_model.t7 -style art -nr_rate 1
 
 # noise
-th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 0 -oracle_rate 0.1 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 4 -style art -crop_size 32
-th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 1 -oracle_rate 0.1 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32
-th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 2 -oracle_rate 0.1 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32
-th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 3 -oracle_rate 0.1 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32 -nr_rate 1 
+th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 0 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 4 -style art -crop_size 32
+th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 1 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32
+th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 2 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32
+th train.lua -save_history 1 -model vgg_7 -method noise -noise_level 3 -model_dir models/test/yuv420_rev2 -test query/noise_test.jpg -backend cudnn -thread 3 -style art -crop_size 32 -nr_rate 1 

lib/settings.lua

@@ -72,7 +72,7 @@ cmd:option("-max_training_image_size", -1, 'if training image is larger than N,
 cmd:option("-use_transparent_png", 0, 'use transparent png (0|1)')
 cmd:option("-resize_blur_min", 0.95, 'min blur parameter for ResizeImage')
 cmd:option("-resize_blur_max", 1.05, 'max blur parameter for ResizeImage')
-cmd:option("-oracle_rate", 0.0, '')
+cmd:option("-oracle_rate", 0.1, '')
 cmd:option("-oracle_drop_rate", 0.5, '')
 cmd:option("-learning_rate_decay", 3.0e-7, 'learning rate decay (learning_rate * 1/(1+num_of_data*patches*epoch))')
 cmd:option("-resume", "", 'resume model file')