Commit 5634d075 authored by Jonathan Shahen's avatar Jonathan Shahen
Browse files

setting up to run on Linux using the programs folder

parent 44967fbe
......@@ -132,7 +132,7 @@ public class VagabondSettings {
* Filename of the CNF Solver executable for Linux;
* Automatically changes this if you are on Linux/Mac to the binary compiled for that system.
*/
public String cnfSolverProgram_Linux = "/home/tripunit/Desktop/lingeling";
public String cnfSolverProgram_Linux = "lingeling";
/**
* Filename of the Nomad executable;
* can change this if you are on Linux/Mac to the binary compiled for that system.
......@@ -318,29 +318,29 @@ public class VagabondSettings {
s.append("migrationBudget=" + migrationBudget + ", ");
switch (reductionAlgorithm) {
case REDUCTION_ILP:
s.append("relativeMIPGapTolerance=" + relativeMIPGapTolerance + ", ");
break;
default:
case REDUCTION_ILP :
s.append("relativeMIPGapTolerance=" + relativeMIPGapTolerance + ", ");
break;
default :
}
switch (placementAlgorithm) {
case PLACEMENT_FILE:
s.append("placementMapFile=" + placementMapFile + ", ");
break;
case PLACEMENT_EQUALSPREAD:
case PLACEMENT_EQUALSPREADHALF:
s.append("equalSpreadNum=" + equalSpreadNum + ", ");
break;
default:
case PLACEMENT_RANDOM:
s.append("numberOfMachines=" + numberOfMachines + ", ");
s.append("numberOfMachineSlots=" + numberOfMachineSlots + ", ");
s.append("numberOfClients=" + numberOfClients + ", ");
s.append("numberOfVMsPerClient=" + numberOfVMsPerClient + ", ");
s.append("fillInEmptySpots=" + fillInEmptySpots + ", ");
s.append("seed=" + randomSeed + ", ");
break;
case PLACEMENT_FILE :
s.append("placementMapFile=" + placementMapFile + ", ");
break;
case PLACEMENT_EQUALSPREAD :
case PLACEMENT_EQUALSPREADHALF :
s.append("equalSpreadNum=" + equalSpreadNum + ", ");
break;
default :
case PLACEMENT_RANDOM :
s.append("numberOfMachines=" + numberOfMachines + ", ");
s.append("numberOfMachineSlots=" + numberOfMachineSlots + ", ");
s.append("numberOfClients=" + numberOfClients + ", ");
s.append("numberOfVMsPerClient=" + numberOfVMsPerClient + ", ");
s.append("fillInEmptySpots=" + fillInEmptySpots + ", ");
s.append("seed=" + randomSeed + ", ");
break;
}
s.append("settingsFile=" + settingsFile + ", ");
......@@ -353,23 +353,23 @@ public class VagabondSettings {
public String getInformativePlacement() {
String name = "";
switch (placementAlgorithm) {
case PLACEMENT_EQUALSPREAD:
name = "EqualSpread_" + equalSpreadNum;
break;
case PLACEMENT_EQUALSPREADHALF:
name = "EqualSpreadHalf_" + equalSpreadNum;
break;
case PLACEMENT_SPECIALTEST1:
name = "SpecialTest1_" + equalSpreadNum;
break;
case PLACEMENT_FILE:
name = "File_" + placementMapFile;
break;
case PLACEMENT_RANDOM:
name = "Random_" + randomSeed;
break;
default:
name = placementAlgorithm.toString() + "_" + equalSpreadNum;
case PLACEMENT_EQUALSPREAD :
name = "EqualSpread_" + equalSpreadNum;
break;
case PLACEMENT_EQUALSPREADHALF :
name = "EqualSpreadHalf_" + equalSpreadNum;
break;
case PLACEMENT_SPECIALTEST1 :
name = "SpecialTest1_" + equalSpreadNum;
break;
case PLACEMENT_FILE :
name = "File_" + placementMapFile;
break;
case PLACEMENT_RANDOM :
name = "Random_" + randomSeed;
break;
default :
name = placementAlgorithm.toString() + "_" + equalSpreadNum;
}
return name;
}
......@@ -532,7 +532,7 @@ public class VagabondSettings {
if (SystemUtils.IS_OS_WINDOWS) {
return new File(programFolder + File.separator + cnfSolverFolder + File.separator + cnfSolverProgram_Win);
} else if (SystemUtils.IS_OS_LINUX) {
return new File(cnfSolverProgram_Linux);
return new File(programFolder + File.separator + cnfSolverFolder + File.separator + cnfSolverProgram_Linux);
} else {
throw new IOException("There is no CNF Solver binary for your OS: " + SystemUtils.OS_NAME);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment