Merge pull request #32 from SciNim/exportLinesearch

export linesearch and test it
SciNim · Nov 21, 2022 · aaa7bb6 · aaa7bb6
2 parents 856c10a + 8883cbd
commit aaa7bb6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/numericalnim/optimize.nim b/src/numericalnim/optimize.nim
@@ -130,7 +130,7 @@ proc secant*(f: proc(x: float64): float64, start: array[2, float64], precision:
 ## Multidimensional methods ##
 ##############################
 
-type LineSearchCriterion = enum
+type LineSearchCriterion* = enum
     Armijo, Wolfe, WolfeStrong, NoLineSearch
 
 type

diff --git a/tests/test_optimize.nim b/tests/test_optimize.nim
@@ -122,6 +122,13 @@ suite "Multi-dim":
         for x in abs(correct - xSol):
             check x < 7e-10
 
+    test "Line Search options":
+        for ls in LineSearchCriterion:
+            let op = lbfgsOptions[float](lineSearchCriterion=ls)
+            let xSol = lbfgs(bananaFunc, x0.clone, options=op, analyticGradient=bananaBend)
+            for x in abs(correct - xSol):
+                check x < 7e-8
+
     let correctParams = [10.4, -0.45].toTensor()
     proc fitFunc(params: Tensor[float], x: float): float =
         params[0] * exp(params[1] * x)