From 78ae967759001f5b292f0356e2fb291826098b7d Mon Sep 17 00:00:00 2001 From: Stefan Derkits <stefan@derkits.at> Date: Thu, 20 Jun 2013 14:34:33 +0200 Subject: [PATCH] revert build.xml after end presentation --- build.xml | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/build.xml b/build.xml index 581f328..0d3e25b 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <property name="log.dir" value="logs" /> <property name="scen.dir" value="scenarios" /> - <property name="numPMs" value="15" /> + <property name="numPMs" value="5" /> <property name="numCloudPartners" value="0" /> <path id="project.classpath"> @@ -37,7 +37,7 @@ <java classname="at.ac.tuwien.lsdc.JobGenerator" fork="true" classpathref="project.classpath"> <assertions refid="project.assertions" /> <arg value="A" /> - <arg value="1500" /> + <arg value="500" /> <arg value="scenarios/scenarioA.csv" /> </java> </target> @@ -46,7 +46,7 @@ <java classname="at.ac.tuwien.lsdc.JobGenerator" fork="true" classpathref="project.classpath"> <assertions refid="project.assertions" /> <arg value="B" /> - <arg value="1500" /> + <arg value="500" /> <arg value="scenarios/scenarioB.csv" /> </java> </target> @@ -55,7 +55,7 @@ <java classname="at.ac.tuwien.lsdc.JobGenerator" fork="true" classpathref="project.classpath"> <assertions refid="project.assertions" /> <arg value="C" /> - <arg value="1500" /> + <arg value="500" /> <arg value="scenarios/scenarioC.csv" /> </java> </target> @@ -162,7 +162,7 @@ <arg value="A" /> <arg value="${numPMs}" /> <arg value="${numCloudPartners}" /> - <arg value="scenarios/A.csv" /> + <arg value="scenarios/scenarioA.csv" /> <arg value="logs/all.csv" /> <arg value="logs/schedulerC_scenarioA.csv" /> </java> @@ -175,7 +175,7 @@ <arg value="B" /> <arg value="${numPMs}" /> <arg value="${numCloudPartners}" /> - <arg value="scenarios/B.csv" /> + <arg value="scenarios/scenarioB.csv" /> <arg value="logs/all.csv" /> <arg value="logs/schedulerC_scenarioB.csv" /> </java> @@ -188,25 +188,12 @@ <arg value="C" /> <arg value="${numPMs}" /> <arg value="${numCloudPartners}" /> - <arg value="scenarios/C.csv" /> + <arg value="scenarios/scenarioC.csv" /> <arg value="logs/all.csv" /> <arg value="logs/schedulerC_scenarioC.csv" /> </java> </target> - <target name="run-scheduler-C-D" depends="compile" description="Run scheduler C on scenario C"> - <java classname="at.ac.tuwien.lsdc.SchedSimulator" fork="true" classpathref="project.classpath"> - <assertions refid="project.assertions" /> - <arg value="C" /> - <arg value="C" /> - <arg value="${numPMs}" /> - <arg value="${numCloudPartners}" /> - <arg value="scenarios/D.csv" /> - <arg value="logs/all.csv" /> - <arg value="logs/schedulerC_scenarioD.csv" /> - </java> - </target> - <target name="run-all-schedulers" depends="run-scheduler-A-A, run-scheduler-A-B, run-scheduler-A-C, run-scheduler-B-A, run-scheduler-B-B, run-scheduler-B-C, run-scheduler-C-A, run-scheduler-C-B, run-scheduler-C-C" description="Run all schedulers and all scenarios"> </target> -- 2.43.0