浏览代码

use settings.validation_crop

nagadomi 10 年之前
父节点
当前提交
fd9dadd7a4
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      lib/settings.lua
  2. 1 1
      train.lua

+ 2 - 2
lib/settings.lua

@@ -21,7 +21,7 @@ cmd:option("-data_dir", "./data", 'data directory')
 cmd:option("-test", "images/miku_small.png", 'test image file')
 cmd:option("-model_dir", "./models", 'model directory')
 cmd:option("-method", "scale", '(noise|scale|noise_scale)')
-cmd:option("-noise_level", 1, '(1|2)')
+cmd:option("-noise_level", 1, '(0|1|2)')
 cmd:option("-color", 'rgb', '(y|rgb)')
 cmd:option("-scale", 2.0, 'scale')
 cmd:option("-learning_rate", 0.00025, 'learning rate for adam')
@@ -64,7 +64,7 @@ settings.images = string.format("%s/images.t7", settings.data_dir)
 settings.image_list = string.format("%s/image_list.txt", settings.data_dir)
 
 settings.validation_ratio = 0.1
-settings.validation_crops = 40
+settings.validation_crops = 20
 
 local srcnn = require './srcnn'
 if (settings.method == "scale" or settings.method == "noise_scale") and settings.scale == 4 then

+ 1 - 1
train.lua

@@ -109,7 +109,7 @@ local function train()
    end
    local best_score = 100000.0
    print("# make validation-set")
-   local valid_xy = make_validation_set(valid_x, transformer, 20)
+   local valid_xy = make_validation_set(valid_x, transformer, settings.validation_crop)
    valid_x = nil
    
    collectgarbage()