rework the examples and erase the city network in the old format

2012-04-11 15:36:50 +01:00
parent 8697fcd2b4
commit f2fbbf29d8
42 changed files with 290 additions and 1343361 deletions
--- a/packages/CLPBN/clpbn/bp/BpSolver.cpp
+++ b/packages/CLPBN/clpbn/bp/BpSolver.cpp
@@ -132,8 +132,8 @@ BpSolver::runSolver (void)
  while (!converged() && nIters_ < BpOptions::maxIter) {
    nIters_ ++;
    if (Constants::DEBUG >= 2) {
-      Util::printHeader (" Iteration " + nIters_);
-      cout << endl;
+      Util::printHeader (string ("Iteration ") + Util::toString (nIters_));
+      // cout << endl;
    }
    switch (BpOptions::schedule) {
     case BpOptions::Schedule::SEQ_RANDOM:
@@ -468,6 +468,9 @@ BpSolver::converged (void)
        if (Constants::DEBUG == 0) break;
      }
    }
+    if (Constants::DEBUG >= 2) {
+      cout << endl;
+    }
  }
  return converged;
 }