MKjanek32/PWrPEA2plus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Corrected FULL_MATRIX parser and automeasure

Browse Source
This commit is contained in:
Jan Potocki
2019-11-26 16:50:36 +01:00
parent 62ff6ef5b5
commit 8ea0a2240a
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pea2plus.cpp
+20 -5
View File
@@ -15,9 +15,9 @@ using namespace std;
// Liczba powtorzen automatycznych pomiarow // Liczba powtorzen automatycznych pomiarow
const int measureIterations = 10; const int measureIterations = 10;
// liczba automatycznych pomiarow // liczba automatycznych pomiarow
const int measureNumber = 4; const int measureNumber = 2;
// Czas zatrzymania algorytmu tabu search w kazdym z automatycznych pomiarow // Czas zatrzymania algorytmu tabu search w kazdym z automatycznych pomiarow
const int measureTabuStop[4] = {30, 60, 120, 240}; const int measureTabuStop[2] = {1, 1};
// Maksymalna odleglosc miast przy automatycznym generowaniu // Maksymalna odleglosc miast przy automatycznym generowaniu
const int measureSalesmanDistance = 400; const int measureSalesmanDistance = 400;
@@ -55,6 +55,17 @@ void parseTSPLIB_FULL_MATRIX(const char *filename, Graph **graph)
salesmanDataFile >> fileInput; salesmanDataFile >> fileInput;
int vertex = stoi(fileInput); int vertex = stoi(fileInput);
do
salesmanDataFile >> fileInput;
while(fileInput != "EDGE_WEIGHT_TYPE:");
salesmanDataFile >> fileInput;
if(fileInput != "EXPLICIT")
{
cout << "+++ MELON MELON MELON +++ Nieobslugiwany format " << fileInput << " +++" << endl;
return;
}
do do
salesmanDataFile >> fileInput; salesmanDataFile >> fileInput;
while(fileInput != "EDGE_WEIGHT_FORMAT:"); while(fileInput != "EDGE_WEIGHT_FORMAT:");
@@ -102,6 +113,8 @@ void parseTSPLIB_FULL_MATRIX(const char *filename, Graph **graph)
cout << "+++ MELON MELON MELON +++ Brak pliku " << filename << " +++" << endl; cout << "+++ MELON MELON MELON +++ Brak pliku " << filename << " +++" << endl;
cout << endl; cout << endl;
} }
return;
} }
void parseTSPLIB_EUC_2D(const char *filename, Graph **graph) void parseTSPLIB_EUC_2D(const char *filename, Graph **graph)
@@ -185,6 +198,8 @@ void parseTSPLIB_EUC_2D(const char *filename, Graph **graph)
cout << "+++ MELON MELON MELON +++ Brak pliku " << filename << " +++" << endl; cout << "+++ MELON MELON MELON +++ Brak pliku " << filename << " +++" << endl;
cout << endl; cout << endl;
} }
return;
} }
void banner() void banner()
@@ -549,7 +564,7 @@ int main(int argc, char *argv[])
for(int j = 1; j < route.size(); j++) for(int j = 1; j < route.size(); j++)
routeLength += graph->getWeight(route.at(j - 1), route.at(j)); routeLength += graph->getWeight(route.at(j - 1), route.at(j));
if(measureResult = -1 || measureResult > routeLength) if(measureResult == -1 || measureResult > routeLength)
measureResult = routeLength; measureResult = routeLength;
// Z dywersyfikacja // Z dywersyfikacja
@@ -561,7 +576,7 @@ int main(int argc, char *argv[])
for(int j = 1; j < route.size(); j++) for(int j = 1; j < route.size(); j++)
routeLength += graph->getWeight(route.at(j - 1), route.at(j)); routeLength += graph->getWeight(route.at(j - 1), route.at(j));
if(measureResultDiv = -1 || measureResultDiv > routeLength) if(measureResultDiv == -1 || measureResultDiv > routeLength)
measureResultDiv = routeLength; measureResultDiv = routeLength;
} }
} }
@@ -573,7 +588,7 @@ int main(int argc, char *argv[])
salesmanToFile << "czas - bez dywersyfikacji - z dywersyfikacja" << endl; salesmanToFile << "czas - bez dywersyfikacji - z dywersyfikacja" << endl;
for(int i = 0; i < measureNumber; i++) for(int i = 0; i < measureNumber; i++)
{ {
salesmanToFile << measureTabuStop[i] << " [s]: " << measureResult << ' ' << measureResultsDiv << endl; salesmanToFile << measureTabuStop[i] << " [s]: " << measureResult << ' ' << measureResultDiv << endl;
} }
salesmanToFile.close(); salesmanToFile.close();