Merge pull request #39 from dityas/dev

Dev
dityas · Jan 4, 2020 · 840e373 · 840e373
2 parents 661b21e + a2df8e2
commit 840e373
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/Protos/build/Protos.jar b/Protos/build/Protos.jar
diff --git a/Protos/src/thinclab/solvers/OnlineInteractiveSymbolicPerseus.java b/Protos/src/thinclab/solvers/OnlineInteractiveSymbolicPerseus.java
@@ -367,7 +367,7 @@ public void boundedPerseusStartFromCurrent(
 				break;
 			}
 
-			if (this.declareApproxConvergenceForAlphaVectors(
+			if (stepId > 10 && this.declareApproxConvergenceForAlphaVectors(
 					this.alphaVectors.length, numIter, beliefRegion.length)) {
 				logger.warn("DECLARING APPROXIMATE CONVERGENCE AT ERROR: " + bellmanErr
 						+ " BECAUSE ALL BELIEFS ARE BEING USED AND NUM ALPHAS IS CONSTANT");

diff --git a/Protos/src/thinclab/solvers/OnlineSolver.java b/Protos/src/thinclab/solvers/OnlineSolver.java
@@ -172,15 +172,24 @@ public boolean declareApproxConvergenceForAlphaVectors(
 
 			this.numSimilar += 1;
 
+			/* set all trackers to initial values if declaring convergence */
 			if (this.numSimilar >= 5) {
+
+				this.numAlphas = -1;
+				this.numBeliefs = -1;
 				this.numSimilar = 0;
+
 				return true;
 			}
 
 			else return false;
 		}
 
-		return false;
+		else {
+
+			this.numSimilar = 0;
+			return false;
+		}
 	}
 
 }