Commit ed572862 authored by Mahesh Tripunitara's avatar Mahesh Tripunitara
Browse files

Merge branch 'master' of https://bitbucket.org/jshahen/vagabond into ReduceToCNFSAT

parents 40c90caf 1ae65db0
......@@ -103,6 +103,7 @@ public class VagabondCUI {
System.out.println("");
System.out.println("-loglevel verbose -settings tests/simpletestCNF.properties !exit");
System.out.println("-loglevel verbose -settings tests/simpletestNomad.properties !exit");
System.out.println("-loglevel verbose -settings tests/simpletestNomadNoMigrationBudget.properties !exit");
System.out.println("");
try {
BufferedReader bfr = new BufferedReader(new FileReader(previousCommandFilename));
......
......@@ -63,7 +63,17 @@ public class ReduceToNomad implements ReduceTo {
/*TIMING*/timing.toggleTimer(tp + "ReduceToNomad::reduce::writeSettingsFile");
FileWriter fws = new FileWriter(nomadSettings);
fws.write("Generated by Vagabond: " + settings.df.format(new Date()) + "\n");
fws.write("BUDGET=" + Precision.round(calculateMigrationPercentage(place, settings.migrationBudget), 3) + "\n");
if (settings.migrationBudget != -1) {
fws.write("BUDGET=" + Precision.round(calculateMigrationPercentage(place, settings.migrationBudget), 3)
+ "\n");
} else {
/**
* This means 1000% of VMs can move per EPOCH
* Ex: TotalVMs = 100
* BUDGET=10 == migrationBuget=1000
*/
fws.write("BUDGET=10\n");
}
fws.write("slidingT=" + settings.slidingWindow + "\n");
fws.write("numEpoch=" + settings.numberOfEpochs + "\n");
fws.write("numMachine=" + place.getNumberOfMachines() + "\n");
......
......@@ -26,7 +26,7 @@ public class CPLEXTests {
populateByRow(cplex, var, rng);
// write model to file
cplex.exportModel("lpex1.lp");
// cplex.exportModel("lpex1.lp");
// solve the model and display the solution if one was found
if (cplex.solve()) {
......@@ -69,7 +69,7 @@ public class CPLEXTests {
populateByColumn(cplex, var, rng);
// write model to file
cplex.exportModel("lpex1.lp");
// cplex.exportModel("lpex1.lp");
// solve the model and display the solution if one was found
if (cplex.solve()) {
......@@ -112,7 +112,7 @@ public class CPLEXTests {
populateByNonzero(cplex, var, rng);
// write model to file
cplex.exportModel("lpex1.lp");
// cplex.exportModel("lpex1.lp");
// solve the model and display the solution if one was found
if (cplex.solve()) {
......
# I am a comment
numberOfMachines=10
numberOfMachineSlots=4
numberOfClients=13
numberOfVMsPerClient=3
fillInEmpty=false
numberOfEpochs=10
slidingWindow=5
placement=randomPlacement
reduction=nomad
migrationBudget=-1
# OPTIONAL: Can Comment these lines out
seed=12
\ No newline at end of file
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