Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/clementfarabet/lua---nnx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'test/test_cg.lua')
-rw-r--r--test/test_cg.lua9
1 files changed, 6 insertions, 3 deletions
diff --git a/test/test_cg.lua b/test/test_cg.lua
index 5dc5b37..3803628 100644
--- a/test/test_cg.lua
+++ b/test/test_cg.lua
@@ -1,17 +1,20 @@
dofile('rosenbrock.lua')
+dofile('l2.lua')
require 'liblbfgs'
neval = 0
maxIterations = 100
maxLineSearch = 40
-linesearch = 2
+linesearch = 0
momentum = 0
verbose = 2
nparam = 2
+local testfunc = rosenbrock
local parameters = torch.Tensor(nparam):fill(0.1)
+local gradParameters = torch.Tensor(nparam):zero()
-output, gradParameters = rosenbrock(parameters)
+output, gradParameters = testfunc(parameters,gradParameters)
function printstats ()
print('nEval: '..neval)
@@ -32,7 +35,7 @@ print('Starting:')
printstats()
lbfgs.evaluate
= function()
- output, gradParameters = rosenbrock(parameters)
+ output, gradParameters = testfunc(parameters,gradParameters)
neval = neval + 1
printstats()
return output