Skip to content

Commit eee35af

Browse files
RuedigerLundeRuedigerLunde
committed
Minor renamings...
1 parent 636bb7b commit eee35af

File tree

5 files changed

+38
-38
lines changed

5 files changed

+38
-38
lines changed

‎aima-gui/src/main/java/aima/gui/fx/applications/IntegratedAimaFxApp.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
import aima.gui.fx.applications.agent.VacuumAgentApp;
1919
import aima.gui.fx.applications.agent.RouteFindingAgentApp;
2020
import aima.gui.fx.applications.search.NQueensSearchApp;
21-
import aima.gui.fx.applications.search.NQueensSearchProg;
21+
import aima.gui.fx.applications.search.NQueensSearchDemo;
2222
import aima.gui.fx.applications.search.games.ConnectFourApp;
2323
import aima.gui.fx.applications.search.local.GeneticMaximumFinderApp;
24-
import aima.gui.fx.applications.search.local.GeneticMaximumFinderProg;
24+
import aima.gui.fx.applications.search.local.GeneticMaximumFinderDemo;
2525
import aima.gui.fx.applications.search.local.SimulatedAnnealingMaximumFinderApp;
2626
import aima.gui.fx.framework.IntegratedAppPaneBuilder;
2727
import javafx.application.Application;
@@ -66,8 +66,8 @@ public static void defineContent(IntegratedAppPaneBuilder builder) {
6666
builder.registerApp(SimulatedAnnealingMaximumFinderApp.class);
6767
builder.registerApp(GeneticMaximumFinderApp.class);
6868

69-
builder.registerProg(GeneticMaximumFinderProg.class);
70-
builder.registerProg(NQueensSearchProg.class);
69+
builder.registerProg(GeneticMaximumFinderDemo.class);
70+
builder.registerProg(NQueensSearchDemo.class);
7171

7272
builder.registerProg(TrivialVacuumDemo.class);
7373

‎aima-gui/src/main/java/aima/gui/fx/applications/search/NQueensSearchApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public static void main(String[] args) {
4343

4444
private NQueensViewCtrl stateViewCtrl;
4545
private SimulationPaneCtrl simPaneCtrl;
46-
private NQueensSearchProg experiment;
46+
private NQueensSearchDemo experiment;
4747

4848
public NQueensSearchApp() {
49-
experiment = new NQueensSearchProg();
49+
experiment = new NQueensSearchDemo();
5050
experiment.addProgressTracer(this::updateStateView);
5151
}
5252

aima-gui/src/main/java/aima/gui/fx/applications/search/NQueensSearchProg.java renamed to aima-gui/src/main/java/aima/gui/fx/applications/search/NQueensSearchDemo.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
import aima.core.search.uninformed.DepthFirstSearch;
2626

2727
/**
28-
* Console application which demonstrates how different search algorithms
28+
* Command line demo which demonstrates how different search algorithms
2929
* solve the n-queens problem.
3030
*
3131
* @author Ruediger Lunde
3232
*/
33-
public class NQueensSearchProg {
33+
public class NQueensSearchDemo {
3434
private int boardSize = 8;
3535
public int populationSize = 10;
3636
public double mutationProbability = 0.2;
@@ -45,31 +45,31 @@ public class NQueensSearchProg {
4545
private List<ProgressTracer> progressTracers = new ArrayList<>();
4646

4747
public static void main(String[] args) {
48-
NQueensSearchProg prog = new NQueensSearchProg();
48+
NQueensSearchDemo demo = new NQueensSearchDemo();
4949
// prog.setBoardSize(32);
50-
prog.addProgressTracer(prog::printProgress);
51-
52-
System.out.println("NQueens depth-first search experiment (boardSize=" + prog.boardSize + ") -->");
53-
prog.initExperiment(Config.EMPTY);
54-
prog.startExperiment(new DepthFirstSearch(new TreeSearch()));
55-
prog.printResult();
56-
57-
System.out.println("NQueens hill climbing search experiment (boardSize=" + prog.boardSize + ") -->");
58-
prog.initExperiment(Config.QUEENS_IN_FIRST_ROW);
59-
prog.startHillClimbingExperiment();
60-
prog.printResult();
61-
62-
System.out.println("NQueens simulated annealing experiment (boardSize=" + prog.boardSize + ", maxIterations="
63-
+ prog.maxIterations + ") -->");
64-
prog.initExperiment(Config.QUEENS_IN_FIRST_ROW);
65-
prog.startSimulatedAnnealingExperiment();
66-
prog.printResult();
67-
68-
System.out.println("NQueens genetic algorithm experiment (boardSize=" + prog.boardSize + ", popSize="
69-
+ prog.populationSize + ", mutProb=" + prog.mutationProbability + ") -->");
70-
prog.initExperiment(Config.EMPTY);
71-
prog.startGenAlgoExperiment(false);
72-
prog.printResult();
50+
demo.addProgressTracer(demo::printProgress);
51+
52+
System.out.println("NQueens depth-first search experiment (boardSize=" + demo.boardSize + ") -->");
53+
demo.initExperiment(Config.EMPTY);
54+
demo.startExperiment(new DepthFirstSearch(new TreeSearch()));
55+
demo.printResult();
56+
57+
System.out.println("NQueens hill climbing search experiment (boardSize=" + demo.boardSize + ") -->");
58+
demo.initExperiment(Config.QUEENS_IN_FIRST_ROW);
59+
demo.startHillClimbingExperiment();
60+
demo.printResult();
61+
62+
System.out.println("NQueens simulated annealing experiment (boardSize=" + demo.boardSize + ", maxIterations="
63+
+ demo.maxIterations + ") -->");
64+
demo.initExperiment(Config.QUEENS_IN_FIRST_ROW);
65+
demo.startSimulatedAnnealingExperiment();
66+
demo.printResult();
67+
68+
System.out.println("NQueens genetic algorithm experiment (boardSize=" + demo.boardSize + ", popSize="
69+
+ demo.populationSize + ", mutProb=" + demo.mutationProbability + ") -->");
70+
demo.initExperiment(Config.EMPTY);
71+
demo.startGenAlgoExperiment(false);
72+
demo.printResult();
7373
}
7474

7575
public void setBoardSize(int size) {

‎aima-gui/src/main/java/aima/gui/fx/applications/search/local/GeneticMaximumFinderApp.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public static void main(String[] args) {
3838

3939
protected FunctionPlotterCtrl funcPlotterCtrl;
4040
private SimulationPaneCtrl simPaneCtrl;
41-
private GeneticMaximumFinderProg experiment;
41+
private GeneticMaximumFinderDemo experiment;
4242

4343
@Override
4444
public String getTitle() {
@@ -96,7 +96,7 @@ public void finalize() {
9696
/** Starts the experiment. */
9797
@SuppressWarnings("unchecked")
9898
public void simulate() {
99-
experiment = new GeneticMaximumFinderProg();
99+
experiment = new GeneticMaximumFinderDemo();
100100
experiment.setFunction((Function<Double, Double>) simPaneCtrl.getParamValue(PARAM_FUNC_SELECT));
101101
experiment.setMutationProb(simPaneCtrl.getParamAsDouble(PARAM_MUT_PROB));
102102
experiment.setPopulationSize(simPaneCtrl.getParamAsInt(PARAM_POPULATION));

aima-gui/src/main/java/aima/gui/fx/applications/search/local/GeneticMaximumFinderProg.java renamed to aima-gui/src/main/java/aima/gui/fx/applications/search/local/GeneticMaximumFinderDemo.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
import aima.core.search.local.Individual;
1515

1616
/**
17-
* Console application which demonstrates how the generic algorithm for numbers
17+
* Command line demo which demonstrates how the generic algorithm for numbers
1818
* can be used to find maximums in a mathematical function.
1919
*
2020
* @author Ruediger Lunde
2121
*/
22-
public class GeneticMaximumFinderProg {
22+
public class GeneticMaximumFinderDemo {
2323

2424
private Function<Double, Double> func = Functions.f1;
2525
private double mutProb = 0.2;
@@ -31,8 +31,8 @@ public class GeneticMaximumFinderProg {
3131

3232
public static void main(String[] args) {
3333
System.out.println("Genetic Maximum Finder Experiment (f1, mutProb=0.2) -->");
34-
GeneticMaximumFinderProg prog = new GeneticMaximumFinderProg();
35-
prog.startExperiment(prog::printGeneration);
34+
GeneticMaximumFinderDemo demo = new GeneticMaximumFinderDemo();
35+
demo.startExperiment(demo::printGeneration);
3636
System.out.println("Experiment finished.");
3737
}
3838

0 commit comments

Comments
 (0)