merging
authorHarshitha <gplkrsh2@illinois.edu>
Thu, 3 May 2012 19:49:36 +0000 (14:49 -0500)
committerHarshitha <gplkrsh2@illinois.edu>
Thu, 3 May 2012 19:49:36 +0000 (14:49 -0500)
1  2 
src/ck-ldb/LBDatabase.C

index 2d1a73261bcba31b11da88a919c7fef12b2b7e60,5b745b20b65ecc3f4f89a499f0994ff157457654..3a0a9dd1d1a9c724cd7e2427b31e92c84e12c008
@@@ -716,7 -716,7 +716,11 @@@ void LBDatabase::ReceiveMinStats(CkRedu
    }
  
    double idle_load_tolerance = IDLE_LOAD_TOLERANCE;
++<<<<<<< HEAD
 +  CkPrintf("%lf Alpha beta cost \n", alpha_beta_cost_to_load);
++=======
+   CkPrintf("alpha_beta_to_load %lf\n", alpha_beta_cost_to_load);
++>>>>>>> 61a4e2efa017ec4edc0eeeb377012830a9151348
    if (alpha_beta_cost_to_load < 0.1) {
      // Ignore the effect hence increase tolerance
      CkPrintf("Changing the idle load tolerance coz this isn't communication intensive benchmark\n");