diff --git a/kite/src/Configuration.cpp b/kite/src/Configuration.cpp index cc495cfc..fbfd1b45 100644 --- a/kite/src/Configuration.cpp +++ b/kite/src/Configuration.cpp @@ -57,14 +57,14 @@ namespace Kite { , _edgeCapacityPercent(Cfg::getParamPercentage("kite.edgeCapacity", 80.0)->asDouble()) , _expandStep (Cfg::getParamPercentage("kite.expandStep" ,100.0)->asDouble()) , _ripupLimits () - , _ripupCost (Cfg::getParamPercentage("kite.ripupCost" , 3)->asInt()) - , _eventsLimit (Cfg::getParamPercentage("kite.eventsLimit" ,4000000)->asInt()) + , _ripupCost (Cfg::getParamInt("kite.ripupCost" , 3)->asInt()) + , _eventsLimit (Cfg::getParamInt("kite.eventsLimit" ,4000000)->asInt()) { - _ripupLimits[BorderRipupLimit] = Cfg::getParamPercentage("kite.borderRipupLimit" ,26)->asInt(); - _ripupLimits[StrapRipupLimit] = Cfg::getParamPercentage("kite.strapRipupLimit" ,16)->asInt(); - _ripupLimits[LocalRipupLimit] = Cfg::getParamPercentage("kite.localRipupLimit" , 7)->asInt(); - _ripupLimits[GlobalRipupLimit] = Cfg::getParamPercentage("kite.globalRipupLimit" , 5)->asInt(); - _ripupLimits[LongGlobalRipupLimit] = Cfg::getParamPercentage("kite.longGlobalRipupLimit" , 5)->asInt(); + _ripupLimits[BorderRipupLimit] = Cfg::getParamInt("kite.borderRipupLimit" ,26)->asInt(); + _ripupLimits[StrapRipupLimit] = Cfg::getParamInt("kite.strapRipupLimit" ,16)->asInt(); + _ripupLimits[LocalRipupLimit] = Cfg::getParamInt("kite.localRipupLimit" , 7)->asInt(); + _ripupLimits[GlobalRipupLimit] = Cfg::getParamInt("kite.globalRipupLimit" , 5)->asInt(); + _ripupLimits[LongGlobalRipupLimit] = Cfg::getParamInt("kite.longGlobalRipupLimit" , 5)->asInt(); } diff --git a/kite/src/KiteMain.cpp b/kite/src/KiteMain.cpp index bc75758f..f2b78792 100644 --- a/kite/src/KiteMain.cpp +++ b/kite/src/KiteMain.cpp @@ -139,7 +139,7 @@ int main ( int argc, char *argv[] ) exit ( 0 ); } - System::getSystem()->setCatchCore ( not coreDump ); + System::get()->setCatchCore ( not coreDump ); if ( verbose1 ) mstream::enable ( mstream::VerboseLevel1 ); if ( verbose2 ) mstream::enable ( mstream::VerboseLevel2 ); diff --git a/kite/src/NegociateWindow.cpp b/kite/src/NegociateWindow.cpp index 03d927b1..e5c02a15 100644 --- a/kite/src/NegociateWindow.cpp +++ b/kite/src/NegociateWindow.cpp @@ -523,7 +523,7 @@ namespace Kite { void NegociateWindow::printStatistics () const { - cout << " o Computing statistics." << endl; + cmess1 << " o Computing statistics." << endl; Statistics globalStatistics; size_t biggestEventsCount = 0; @@ -539,11 +539,11 @@ namespace Kite { biggestRSsize = _gcellRoutingSets[i]->getGCells().size(); } - cout << Dots::asSizet(" - Processeds Events Total",RoutingEvent::getProcesseds()) << endl; - cout << Dots::asSizet(" - Unique Events Total" - ,(RoutingEvent::getProcesseds() - RoutingEvent::getCloneds())) << endl; - cout << Dots::asSizet(" - Biggest Events Chunk" ,biggestEventsCount) << endl; - cout << Dots::asSizet(" - Biggest Routing Set" ,biggestRSsize) << endl; + cmess1 << Dots::asSizet(" - Processeds Events Total",RoutingEvent::getProcesseds()) << endl; + cmess1 << Dots::asSizet(" - Unique Events Total" + ,(RoutingEvent::getProcesseds() - RoutingEvent::getCloneds())) << endl; + cmess1 << Dots::asSizet(" - Biggest Events Chunk" ,biggestEventsCount) << endl; + cmess1 << Dots::asSizet(" - Biggest Routing Set" ,biggestRSsize) << endl; }