diff options
| author | redpony <redpony@ca354974-eb3a-0410-8f5c-d3948404989b> | 2012-04-02 08:57:20 +0400 |
|---|---|---|
| committer | redpony <redpony@ca354974-eb3a-0410-8f5c-d3948404989b> | 2012-04-02 08:57:20 +0400 |
| commit | e8bbc3d9dc5ac6a954d9f441eaebdf5a700a4422 (patch) | |
| tree | 3a0d14eca11ee8021d7834939591e0274807f381 | |
| parent | d923556e8925b837a9e8a662fb969637e862bf97 (diff) | |
fix mkcls to use unordered_map
| -rw-r--r-- | mkcls-v2/ProblemTest.cpp | 3 | ||||
| -rw-r--r-- | mkcls-v2/ProblemTest.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/mkcls-v2/ProblemTest.cpp b/mkcls-v2/ProblemTest.cpp index 40fea7a..60ca39d 100644 --- a/mkcls-v2/ProblemTest.cpp +++ b/mkcls-v2/ProblemTest.cpp @@ -200,14 +200,13 @@ double solveProblem(int verbose,Problem &problem,int versuche, void multiSolveProblem(Problem &problem,int versuche,int maxSeconds) { int i; - int maxLaeufe; double rDummy; StatVar end[MAX_OPT_NR],auswertungen[MAX_OPT_NR],start[MAX_OPT_NR]; double maxClock=clockSec()+maxSeconds; if(maxSeconds<=0)maxClock=0; solveProblem(ProblemTestVerboseMode,problem,versuche,-1,HC_OPT,rDummy, end[HC_OPT],auswertungen[HC_OPT],start[HC_OPT],maxClock); - maxLaeufe=(int)(auswertungen[HC_OPT].getMean()*5); + //int maxLaeufe=(int)(auswertungen[HC_OPT].getMean()*5); for(i=0;i<MAX_OPT_NR;i++) { if( i==HC_OPT ) diff --git a/mkcls-v2/ProblemTest.h b/mkcls-v2/ProblemTest.h index 4bd8bda..fde4db7 100644 --- a/mkcls-v2/ProblemTest.h +++ b/mkcls-v2/ProblemTest.h @@ -35,7 +35,7 @@ USA. #include <fstream> -enum {TA_OPT, HC_OPT, SA_OPT,RRT_OPT,GDA_OPT,MAX_OPT_NR,MY_OPT }; +enum {TA_OPT, HC_OPT, SA_OPT,RRT_OPT,GDA_OPT,MY_OPT,MAX_OPT_NR }; class IterOptimization; |