added proper limits for random sampling

elevate-lang · Jan 11, 2024 · a0b717e · a0b717e
1 parent 7a77010
commit a0b717e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/scala/elevate/heuristic_search/heuristics/RandomGraph.scala b/src/main/scala/elevate/heuristic_search/heuristics/RandomGraph.scala
@@ -18,7 +18,10 @@ class RandomGraph[P] extends Heuristic[P] {
       // reset solution
       solution = initialSolution
 
-      for (_ <- Range(0, depth)) {
+      var depthCounter: Int = 0
+      while (depthCounter < depth && sampleCounter < samples) {
+        depthCounter += 1
+        sampleCounter += 1
 
         //get neighbourhood
         val Ns: Seq[Solution[P]] = panel.N(solution)
@@ -40,7 +43,6 @@ class RandomGraph[P] extends Heuristic[P] {
             // get next element
             solution = Ns.apply(random.nextInt(Ns.size))
             solutionValue = panel.f(solution)
-            sampleCounter += 1
 
             solution
         }