Skip to content

Commit

Permalink
rename from *SolverBenchmarkConfig.xml to *BenchmarkerConfig.xml
Browse files Browse the repository at this point in the history
  • Loading branch information
@ge0ffrey
ge0ffrey committed Jan 1, 2012
1 parent 0d0bd54 commit 2bbe783
Show file tree
Hide file tree
Showing 29 changed files with 95 additions and 119 deletions.
10 changes: 10 additions & 0 deletions ...er-distribution/src/main/assembly/filtered-resources/UpgradeFromPreviousVersionRecipe.txt
View file
Expand Up @@ -1401,3 +1401,13 @@ After in *BenchmarkConfig.xml:
...
<statisticDirectory>local/data/nurserostering/statistic</statisticDirectory>
...

[RECOMMENDED] Rename *SolverBenchmarkConfig.xml to *BenchmarkerConfig.xml.
This is to avoid confusion with the more fine-grained SolverBenchmark and SolverBenchmarkConfig classes.
The examples wrongly named their Benchmarker configs for example nqueensSolverBenchmarkConfig.xml instead of nqueensBenchmarkerConfig.xml.
Before in *BenchmarkApp.java:
public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml";
After in *BenchmarkApp.java:
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensBenchmarkerConfig.xml";
19 changes: 5 additions & 14 deletions ...mples/src/main/java/org/drools/planner/examples/app/GeneralDroolsPlannerBenchmarkApp.java
View file
Expand Up @@ -16,29 +16,20 @@

package org.drools.planner.examples.app;

import org.drools.planner.examples.cloudbalancing.domain.CloudBalance;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;
import org.drools.planner.examples.examination.domain.Examination;
import org.drools.planner.examples.manners2009.domain.Manners2009;
import org.drools.planner.examples.nqueens.domain.NQueens;
import org.drools.planner.examples.nurserostering.domain.NurseRoster;
import org.drools.planner.examples.pas.domain.PatientAdmissionSchedule;
import org.drools.planner.examples.travelingtournament.domain.TravelingTournament;
import org.drools.planner.examples.tsp.domain.TravelingSalesmanTour;

public class GeneralDroolsPlannerBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/app/benchmark/generalDroolsPlannerBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/app/benchmark/generalDroolsPlannerBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
String solverConfig = DEFAULT_BENCHMARKER_CONFIG;
new GeneralDroolsPlannerBenchmarkApp(solverConfig).process();
}

public GeneralDroolsPlannerBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public GeneralDroolsPlannerBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
19 changes: 9 additions & 10 deletions .../main/java/org/drools/planner/examples/cloudbalancing/app/CloudBalancingBenchmarkApp.java
View file
Expand Up @@ -16,34 +16,33 @@

package org.drools.planner.examples.cloudbalancing.app;

import org.drools.planner.examples.cloudbalancing.domain.CloudBalance;
import org.drools.planner.examples.common.app.CommonBenchmarkApp;

public class CloudBalancingBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/cloudbalancing/benchmark/cloudBalancingSolverBenchmarkConfig.xml";
// public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
// = "/org/drools/planner/examples/cloudbalancing/benchmark/cloudBalancingStepLimitSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/cloudbalancing/benchmark/cloudBalancingBenchmarkerConfig.xml";
// public static final String STEP_LIMIT_BENCHMARKER_CONFIG
// = "/org/drools/planner/examples/cloudbalancing/benchmark/cloudBalancingStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("default")) {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
// } else if (args[0].equals("stepLimit")) {
// solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
// solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
}
new CloudBalancingBenchmarkApp(solverConfig).process();
}

public CloudBalancingBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public CloudBalancingBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
4 changes: 2 additions & 2 deletions ...ner-examples/src/main/java/org/drools/planner/examples/common/app/CommonBenchmarkApp.java
View file
Expand Up @@ -22,8 +22,8 @@ public abstract class CommonBenchmarkApp extends LoggingMain {

protected XmlSolverBenchmarker solverBenchmarker;

protected CommonBenchmarkApp(String solverBenchmarkConfig) {
solverBenchmarker = new XmlSolverBenchmarker().configure(solverBenchmarkConfig);
protected CommonBenchmarkApp(String benchmarkerConfig) {
solverBenchmarker = new XmlSolverBenchmarker().configure(benchmarkerConfig);
}

public void process() {
Expand Down
21 changes: 9 additions & 12 deletions ...n/java/org/drools/planner/examples/curriculumcourse/app/CurriculumCourseBenchmarkApp.java
View file
Expand Up @@ -16,36 +16,33 @@

package org.drools.planner.examples.curriculumcourse.app;

import java.io.File;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.curriculumcourse.domain.CurriculumCourseSchedule;

public class CurriculumCourseBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseBenchmarkerConfig.xml";
public static final String STEP_LIMIT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/curriculumcourse/benchmark/curriculumCourseStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("default")) {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
} else if (args[0].equals("stepLimit")) {
solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
}
new CurriculumCourseBenchmarkApp(solverConfig).process();
}

public CurriculumCourseBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public CurriculumCourseBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
21 changes: 9 additions & 12 deletions ...es/src/main/java/org/drools/planner/examples/examination/app/ExaminationBenchmarkApp.java
View file
Expand Up @@ -16,36 +16,33 @@

package org.drools.planner.examples.examination.app;

import java.io.File;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.examination.domain.Examination;

public class ExaminationBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationStepLimitSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationBenchmarkerConfig.xml";
public static final String STEP_LIMIT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/examination/benchmark/examinationStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("default")) {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
} else if (args[0].equals("stepLimit")) {
solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
}
new ExaminationBenchmarkApp(solverConfig).process();
}

public ExaminationBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public ExaminationBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
19 changes: 9 additions & 10 deletions .../org/drools/planner/examples/machinereassignment/app/MachineReassignmentBenchmarkApp.java
View file
Expand Up @@ -17,33 +17,32 @@
package org.drools.planner.examples.machinereassignment.app;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.machinereassignment.domain.MachineReassignment;

public class MachineReassignmentBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/machinereassignment/benchmark/machineReassignmentSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/machinereassignment/benchmark/machineReassignmentStepLimitSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/machinereassignment/benchmark/machineReassignmentBenchmarkerConfig.xml";
public static final String STEP_LIMIT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/machinereassignment/benchmark/machineReassignmentStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("default")) {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
} else if (args[0].equals("stepLimit")) {
solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
}
new MachineReassignmentBenchmarkApp(solverConfig).process();
}

public MachineReassignmentBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public MachineReassignmentBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
21 changes: 9 additions & 12 deletions ...r-examples/src/main/java/org/drools/planner/examples/nqueens/app/NQueensBenchmarkApp.java
View file
Expand Up @@ -16,36 +16,33 @@

package org.drools.planner.examples.nqueens.app;

import java.io.File;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.nqueens.domain.NQueens;

public class NQueensBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensStepLimitSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensBenchmarkerConfig.xml";
public static final String STEP_LIMIT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nqueens/benchmark/nqueensStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("default")) {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
} else if (args[0].equals("stepLimit")) {
solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
solverConfig = DEFAULT_BENCHMARKER_CONFIG;
}
new NQueensBenchmarkApp(solverConfig).process();
}

public NQueensBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public NQueensBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
33 changes: 15 additions & 18 deletions .../main/java/org/drools/planner/examples/nurserostering/app/NurseRosteringBenchmarkApp.java
View file
Expand Up @@ -16,44 +16,41 @@

package org.drools.planner.examples.nurserostering.app;

import java.io.File;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.nurserostering.domain.NurseRoster;

public class NurseRosteringBenchmarkApp extends CommonBenchmarkApp {

public static final String SPRINT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintSolverBenchmarkConfig.xml";
public static final String MEDIUM_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumSolverBenchmarkConfig.xml";
public static final String LONG_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongSolverBenchmarkConfig.xml";
public static final String STEP_LIMIT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitSolverBenchmarkConfig.xml";
public static final String SPRINT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringSprintBenchmarkerConfig.xml";
public static final String MEDIUM_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringMediumBenchmarkerConfig.xml";
public static final String LONG_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringLongBenchmarkerConfig.xml";
public static final String STEP_LIMIT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/nurserostering/benchmark/nurseRosteringStepLimitBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0) {
if (args[0].equals("sprint")) {
solverConfig = SPRINT_SOLVER_BENCHMARK_CONFIG;
solverConfig = SPRINT_BENCHMARKER_CONFIG;
} else if (args[0].equals("medium")) {
solverConfig = MEDIUM_SOLVER_BENCHMARK_CONFIG;
solverConfig = MEDIUM_BENCHMARKER_CONFIG;
} else if (args[0].equals("long")) {
solverConfig = LONG_SOLVER_BENCHMARK_CONFIG;
solverConfig = LONG_BENCHMARKER_CONFIG;
} else if (args[0].equals("stepLimit")) {
solverConfig = STEP_LIMIT_SOLVER_BENCHMARK_CONFIG;
solverConfig = STEP_LIMIT_BENCHMARKER_CONFIG;
} else {
throw new IllegalArgumentException("The program argument (" + args[0] + ") is not supported.");
}
} else {
solverConfig = MEDIUM_SOLVER_BENCHMARK_CONFIG;
solverConfig = MEDIUM_BENCHMARKER_CONFIG;
}
new NurseRosteringBenchmarkApp(solverConfig).process();
}

public NurseRosteringBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public NurseRosteringBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}
21 changes: 5 additions & 16 deletions ...c/main/java/org/drools/planner/examples/pas/app/PatientAdmissionScheduleBenchmarkApp.java
View file
Expand Up @@ -16,30 +16,19 @@

package org.drools.planner.examples.pas.app;

import java.io.File;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.drools.planner.examples.pas.domain.PatientAdmissionSchedule;

public class PatientAdmissionScheduleBenchmarkApp extends CommonBenchmarkApp {

public static final String DEFAULT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleSolverBenchmarkConfig.xml";
public static final String SHORT_SOLVER_BENCHMARK_CONFIG
= "/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleShortSolverBenchmarkConfig.xml";
public static final String DEFAULT_BENCHMARKER_CONFIG
= "/org/drools/planner/examples/pas/benchmark/patientAdmissionScheduleBenchmarkerConfig.xml";

public static void main(String[] args) {
String solverConfig;
if (args.length > 0 && args[0].equals("short")) {
solverConfig = SHORT_SOLVER_BENCHMARK_CONFIG;
} else {
solverConfig = DEFAULT_SOLVER_BENCHMARK_CONFIG;
}
new PatientAdmissionScheduleBenchmarkApp(solverConfig).process();
new PatientAdmissionScheduleBenchmarkApp(DEFAULT_BENCHMARKER_CONFIG).process();
}

public PatientAdmissionScheduleBenchmarkApp(String solverBenchmarkConfig) {
super(solverBenchmarkConfig);
public PatientAdmissionScheduleBenchmarkApp(String benchmarkerConfig) {
super(benchmarkerConfig);
}

}

0 comments on commit 2bbe783

Please sign in to comment.