Skip to content

Commit a5d8d30

Browse files
RuedigerLundeRuedigerLunde
committed
Package structure cleaned up, new integrated osm application added.
1 parent 9a8d548 commit a5d8d30

22 files changed

+601
-465
lines changed

‎aima-gui/build.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<import file="${path.to.aima-core.project}/build.xml"/>
88

9-
<property name="aima-gui.run" value="aima.gui.swing.demo.AimaDemoApp" />
9+
<property name="aima-gui.run" value="aima.gui.swing.demo.IntegratedAimaApp" />
1010

1111
<path id="aima-gui.classpath">
1212
<path refid="aima-core.classpath" />

aima-gui/src/main/java/aima/gui/fx/demo/IntegratedAimaApp.java renamed to aima-gui/src/main/java/aima/gui/fx/demo/IntegratedAimaFxApp.java

Lines changed: 92 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,92 @@
1-
package aima.gui.fx.demo;
2-
3-
import aima.gui.fx.demo.search.CspMapColoringApp;
4-
import aima.gui.fx.demo.search.games.EightPuzzleApp;
5-
import aima.gui.fx.demo.search.games.TicTacToeApp;
6-
import aima.gui.prog.agent.NondeterministicVacuumEnvironmentProg;
7-
import aima.gui.prog.agent.TrivialVacuumProg;
8-
import aima.gui.prog.logic.DPLLProg;
9-
import aima.gui.prog.logic.FolProg;
10-
import aima.gui.prog.logic.PLFCEntailsProg;
11-
import aima.gui.prog.logic.PLResolutionProg;
12-
import aima.gui.prog.logic.TTEntailsProg;
13-
import aima.gui.prog.logic.WalkSatProg;
14-
import aima.gui.prog.search.EightPuzzleProg;
15-
import aima.gui.prog.search.MapColoringCSPProg;
16-
import aima.gui.prog.search.NQueensProg;
17-
import aima.gui.prog.search.TicTacToeProg;
18-
import aima.gui.fx.demo.agent.VacuumAgentApp;
19-
import aima.gui.fx.demo.agent.RouteFindingAgentApp;
20-
import aima.gui.fx.demo.search.NQueensSearchApp;
21-
import aima.gui.fx.demo.search.NQueensSearchProg;
22-
import aima.gui.fx.demo.search.games.ConnectFourApp;
23-
import aima.gui.fx.demo.search.local.GeneticMaximumFinderApp;
24-
import aima.gui.fx.demo.search.local.GeneticMaximumFinderProg;
25-
import aima.gui.fx.demo.search.local.SimulatedAnnealingMaximumFinderApp;
26-
import aima.gui.fx.framework.IntegratedAppPaneBuilder;
27-
import javafx.application.Application;
28-
import javafx.scene.Scene;
29-
import javafx.scene.layout.BorderPane;
30-
import javafx.stage.Stage;
31-
32-
/**
33-
* Integrated application which provides access to all JavaFX demos which are
34-
* currently available in the AIMA-GUI project.
35-
*
36-
* @author Ruediger Lunde
37-
*/
38-
public class IntegratedAimaApp extends Application {
39-
40-
public static void main(String[] args) {
41-
launch(args);
42-
}
43-
44-
@Override
45-
public void start(Stage primaryStage) throws Exception {
46-
IntegratedAppPaneBuilder builder = new IntegratedAppPaneBuilder();
47-
defineContent(builder);
48-
BorderPane root = new BorderPane();
49-
builder.getResultFor(root, primaryStage);
50-
primaryStage.setScene(new Scene(root, 1200, 800));
51-
primaryStage.show();
52-
}
53-
54-
protected void defineContent(IntegratedAppPaneBuilder builder) {
55-
builder.defineTitle("Integrated FX AIMA App");
56-
57-
builder.registerApp(VacuumAgentApp.class);
58-
builder.registerApp(RouteFindingAgentApp.class);
59-
60-
builder.registerApp(CspMapColoringApp.class);
61-
builder.registerApp(NQueensSearchApp.class);
62-
63-
builder.registerApp(EightPuzzleApp.class);
64-
builder.registerApp(ConnectFourApp.class);
65-
builder.registerApp(TicTacToeApp.class);
66-
67-
builder.registerApp(SimulatedAnnealingMaximumFinderApp.class);
68-
builder.registerApp(GeneticMaximumFinderApp.class);
69-
70-
71-
72-
builder.registerProg(GeneticMaximumFinderProg.class);
73-
builder.registerProg(NQueensSearchProg.class);
74-
75-
builder.registerProg(TrivialVacuumProg.class);
76-
77-
builder.registerProg(EightPuzzleProg.class);
78-
builder.registerProg(TicTacToeProg.class);
79-
builder.registerProg(NQueensProg.class);
80-
builder.registerProg(MapColoringCSPProg.class);
81-
builder.registerProg(NondeterministicVacuumEnvironmentProg.class);
82-
83-
builder.registerProg(TTEntailsProg.class);
84-
builder.registerProg(PLFCEntailsProg.class);
85-
builder.registerProg(PLResolutionProg.class);
86-
builder.registerProg(DPLLProg.class);
87-
builder.registerProg(WalkSatProg.class);
88-
builder.registerProg(FolProg.class);
89-
90-
// builder.registerProg(ProbabilityProg.class); // to slow.
91-
92-
// builder.registerProg(LearningProg.class); // to slow.
93-
}
94-
95-
}
1+
package aima.gui.fx.demo;
2+
3+
import aima.gui.fx.demo.search.CspMapColoringApp;
4+
import aima.gui.fx.demo.search.games.EightPuzzleApp;
5+
import aima.gui.fx.demo.search.games.TicTacToeApp;
6+
import aima.gui.prog.agent.NondeterministicVacuumEnvironmentProg;
7+
import aima.gui.prog.agent.TrivialVacuumProg;
8+
import aima.gui.prog.logic.DPLLProg;
9+
import aima.gui.prog.logic.FolProg;
10+
import aima.gui.prog.logic.PLFCEntailsProg;
11+
import aima.gui.prog.logic.PLResolutionProg;
12+
import aima.gui.prog.logic.TTEntailsProg;
13+
import aima.gui.prog.logic.WalkSatProg;
14+
import aima.gui.prog.search.EightPuzzleProg;
15+
import aima.gui.prog.search.MapColoringCSPProg;
16+
import aima.gui.prog.search.NQueensProg;
17+
import aima.gui.prog.search.TicTacToeProg;
18+
import aima.gui.fx.demo.agent.VacuumAgentApp;
19+
import aima.gui.fx.demo.agent.RouteFindingAgentApp;
20+
import aima.gui.fx.demo.search.NQueensSearchApp;
21+
import aima.gui.fx.demo.search.NQueensSearchProg;
22+
import aima.gui.fx.demo.search.games.ConnectFourApp;
23+
import aima.gui.fx.demo.search.local.GeneticMaximumFinderApp;
24+
import aima.gui.fx.demo.search.local.GeneticMaximumFinderProg;
25+
import aima.gui.fx.demo.search.local.SimulatedAnnealingMaximumFinderApp;
26+
import aima.gui.fx.framework.IntegratedAppPaneBuilder;
27+
import javafx.application.Application;
28+
import javafx.scene.Scene;
29+
import javafx.scene.layout.BorderPane;
30+
import javafx.stage.Stage;
31+
32+
/**
33+
* Integrated application which provides access to all JavaFX demos which are
34+
* currently available in the AIMA-GUI project.
35+
*
36+
* @author Ruediger Lunde
37+
*/
38+
public class IntegratedAimaFxApp extends Application {
39+
40+
public static void main(String[] args) {
41+
launch(args);
42+
}
43+
44+
@Override
45+
public void start(Stage primaryStage) throws Exception {
46+
IntegratedAppPaneBuilder builder = new IntegratedAppPaneBuilder();
47+
builder.defineTitle("Integrated AIMA FX App");
48+
defineContent(builder);
49+
BorderPane root = new BorderPane();
50+
builder.getResultFor(root, primaryStage);
51+
primaryStage.setScene(new Scene(root, 1200, 800));
52+
primaryStage.show();
53+
}
54+
55+
public static void defineContent(IntegratedAppPaneBuilder builder) {
56+
builder.registerApp(VacuumAgentApp.class);
57+
builder.registerApp(RouteFindingAgentApp.class);
58+
59+
builder.registerApp(CspMapColoringApp.class);
60+
builder.registerApp(NQueensSearchApp.class);
61+
62+
builder.registerApp(EightPuzzleApp.class);
63+
builder.registerApp(ConnectFourApp.class);
64+
builder.registerApp(TicTacToeApp.class);
65+
66+
builder.registerApp(SimulatedAnnealingMaximumFinderApp.class);
67+
builder.registerApp(GeneticMaximumFinderApp.class);
68+
69+
builder.registerProg(GeneticMaximumFinderProg.class);
70+
builder.registerProg(NQueensSearchProg.class);
71+
72+
builder.registerProg(TrivialVacuumProg.class);
73+
74+
builder.registerProg(EightPuzzleProg.class);
75+
builder.registerProg(TicTacToeProg.class);
76+
builder.registerProg(NQueensProg.class);
77+
builder.registerProg(MapColoringCSPProg.class);
78+
builder.registerProg(NondeterministicVacuumEnvironmentProg.class);
79+
80+
builder.registerProg(TTEntailsProg.class);
81+
builder.registerProg(PLFCEntailsProg.class);
82+
builder.registerProg(PLResolutionProg.class);
83+
builder.registerProg(DPLLProg.class);
84+
builder.registerProg(WalkSatProg.class);
85+
builder.registerProg(FolProg.class);
86+
87+
// builder.registerProg(ProbabilityProg.class); // to slow.
88+
89+
// builder.registerProg(LearningProg.class); // to slow.
90+
}
91+
92+
}

‎aima-gui/src/main/java/aima/gui/fx/demo/agent/RouteFindingAgentApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import aima.gui.fx.framework.SimulationPaneBuilder;
1919
import aima.gui.fx.framework.SimulationPaneCtrl;
2020
import aima.gui.fx.views.MapEnvironmentViewCtrl;
21-
import aima.gui.swing.demo.agent.map.SearchFactory;
21+
import aima.gui.util.SearchFactory;
2222
import javafx.scene.layout.BorderPane;
2323
import javafx.scene.layout.Pane;
2424
import javafx.scene.layout.StackPane;

aima-gui/src/main/java/aima/gui/swing/demo/AimaDemoApp.java renamed to aima-gui/src/main/java/aima/gui/swing/demo/IntegratedAimaApp.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*
2929
* @author Ruediger Lunde
3030
*/
31-
public class AimaDemoApp {
31+
public class IntegratedAimaApp {
3232

3333
/** Registers agent applications and console program demos. */
3434
public static void registerDemos(AimaDemoFrame frame) {

‎aima-gui/src/main/java/aima/gui/swing/demo/agent/map/AbstractMapAgentController.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import aima.gui.swing.framework.AgentAppController;
1111
import aima.gui.swing.framework.MessageLogger;
1212
import aima.gui.swing.framework.SimulationThread;
13+
import aima.gui.util.SearchFactory;
1314

1415
/**
1516
* Provides a useful base class for agent application controller implementations

‎aima-gui/src/main/java/aima/gui/swing/demo/agent/map/MapAgentFrame.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package aima.gui.swing.demo.agent.map;
22

33
import aima.gui.swing.framework.AgentAppFrame;
4+
import aima.gui.util.SearchFactory;
45

56
/**
67
* Universal frame for experiments with route planning agents. It configures the

‎aima-gui/src/main/java/aima/gui/swing/demo/agent/map/RouteFindingAgentApp.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import aima.gui.swing.framework.AgentAppFrame;
1616
import aima.gui.swing.framework.MessageLogger;
1717
import aima.gui.swing.framework.SimpleAgentApp;
18+
import aima.gui.util.SearchFactory;
1819

1920
/**
2021
* Demo example of a route finding agent application with GUI. The main method

‎aima-gui/src/main/java/aima/gui/swing/demo/agent/map/SearchFactory.java‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

aima-gui/src/main/java/aima/gui/fx/demo/agent/SearchFactory.java renamed to aima-gui/src/main/java/aima/gui/util/SearchFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package aima.gui.fx.demo.agent;
1+
package aima.gui.util;
22

33
import aima.core.search.framework.HeuristicFunction;
44
import aima.core.search.framework.SearchForActions;

0 commit comments

Comments
 (0)