asp bugfix

ACEsuit · Sep 11, 2024 · 56dcdcc · 56dcdcc
1 parent f892f48
commit 56dcdcc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/asp.jl b/src/asp.jl
@@ -71,8 +71,8 @@ function solve(solver::ASP, A, y, Aval=A, yval=y)
     tracer = asp_homotopy(AP, y; solver.params...)
 
     q = length(tracer) 
-    every = max(1, q ÷ solver.nstore)
-    istore = unique([1:every:q; q])
+    every = max(1, q / solver.nstore)
+    istore = unique(round.(Int, [1:every:q; q]))
     new_tracer = [ (solution = tracer[i][1], λ = tracer[i][2], σ = 0.0 ) 
                    for i in istore ]
 

diff --git a/test/test_asp.jl b/test/test_asp.jl
@@ -1,6 +1,5 @@
 using ACEfit
 using LinearAlgebra, Random, Test 
-using Random
 
 ##
 
@@ -29,6 +28,12 @@ Av = A[val_indices,:]
 yt = y[train_indices]
 yv = y[val_indices]
 
+for (nstore, n1) in [ (20, 21), (100, 101), (200, 165)]
+   solver = ACEfit.ASP(P=I, select = :final, nstore = nstore, loglevel=0, traceFlag=true)
+   results = ACEfit.solve(solver, A, y)
+   @test length(results["path"]) == n1 
+end
+
 for (select, tolr, tolc) in [ (:final, 10*epsn, 1), 
                              ( (:byerror,1.3), 10*epsn, 1), 
                             ( (:bysize,73), 1, 10) ]