Skip to content

Commit

Permalink
Preparing 1.9.1 release.
Browse files Browse the repository at this point in the history 
Fixing Jars to launch new JavaFX integrated Apps.
  • Loading branch information
@ctjoreilly
ctjoreilly committed Dec 18, 2016
1 parent 3b9b25f commit a89b8d2
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 29 deletions.
2 changes: 1 addition & 1 deletion aima-all/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# b) Use -Dproperty=value arguments

# VERSION
aima-all.version=1.9.0-Search-and-JavaFX
aima-all.version=1.9.1-Search-and-JavaFX
# DIRECTORY LOCATIONS
path.to.aima-core.project=../aima-core
path.to.aima-gui.project=../aima-gui
Expand Down
2 changes: 1 addition & 1 deletion aima-all/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<target name="aima-all.release" depends="aima-all.makedirs,aima-core.release,aima-gui.release,aimax-osm.release">
<copy todir="${aima-all.dir.build.release}/aima-core">
<fileset dir="${path.to.aima-core.project}" excludes="**/*.git, .gitignore, build/, bin/" />
<fileset dir="${path.to.aima-core.project}" excludes="**/*.git, .gitignore, build/, bin/, target/" />
</copy>
<copy todir="${aima-all.dir.build.release}/aima-gui">
<fileset dir="${path.to.aima-gui.project}" excludes="**/*.git, .gitignore, build/ bin/" />
Expand Down
14 changes: 9 additions & 5 deletions aima-core/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
== Requirements ==
# JDK 1.8 - is the baseline JDK against which this project is developed.

== Current Release: 0.12.0-Search-Improvements ==
0.12.0-Search-Improvements : Dec 18 2016 :<br>
* Improvements/Simplifications across search related APIs.
* Complete set of algorithms for Chapters 22, 23 and 25 added.
* Moved from JDK-7 to 8 as the baseline for further development.
== Current Release: 3.0.0-Search-Improvements ==
3.0.0-Search-Improvements : Dec 18 2016 :<br>
* Releasing as a full version number, corresponding to 3rd edition of book
(i.e. all 3rd edition releases will start with 3.x.x going forward).

= Details =

Expand Down Expand Up @@ -109,6 +108,11 @@ The Perceptron and DecisionTreeLearners work on *numerized datasets*. If you int
2. Learners all implement the Learner interface with 3 methods, train, predict and test. If you want to add a new type of Learner (a partitioning Decision Tree learner perhaps?) you need to implement this interface.

= Change History (Update in reverse chronological order) =
0.12.0-Search-Improvements : Dec 18 2016 :<br>
* Improvements/Simplifications across search related APIs.
* Complete set of algorithms for Chapters 22, 23 and 25 added.
* Moved from JDK-7 to 8 as the baseline for further development.

0.11.1-Chp7-Complete : Mar 15 2015 :<br>
* Fixed Issue 33, Add implementation of - Fig 7.22 SATPlan
* Improved performance of DPLL implementation and added an alternative implementation that uses a couple
Expand Down
2 changes: 1 addition & 1 deletion aima-core/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# b) Use -Dproperty=value arguments

# VERSION
aima-core.version=0.12.0
aima-core.version=3.0.0
# DIRECTORY LOCATIONS
aima-core.dir.src=${aima-core.basedir}/src
aima-core.dir.lib=${aima-core.basedir}/lib
Expand Down
2 changes: 1 addition & 1 deletion aima-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>

<name>AIMA-Java Core</name>
<version>0.12.0</version>
<version>3.0.0</version>
<groupId>com.googlecode.aima-java</groupId>
<artifactId>aima-core</artifactId>

Expand Down
21 changes: 12 additions & 9 deletions aima-gui/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,9 @@ They use different frameworks (sub-package framework) and also differ in functio
== Requirements ==
# Depends on the aima-core project.

== Current Release: 1.1.0-AIMA-GUI JavaFX GUIs Added ==
1.1.0-JavaFX GUIs Added : 18 Dec 2016 :<br>
* Java FX based GUIs added.
* Simulated Annealing, FX based, Application Added.
* Genetic Algorithm, FX based, Application Added.
* Updated to work with the latest version of aima-core (0.12.0).
* Search Framework improvements.
* Bidirectional Search options added to GUI demo applications.
* Monte Carlo Localization (MCL), Swing based, Application Added.
== Current Release: 1.1.1-AIMA-GUI JavaFX GUIs Added ==
1.1.1-JavaFX GUIs Added : 18 Dec 2016 :<br>
* Fixed Jar to launch JavaFX Integrated App by default.

== Running the GUIs and Command Line Demos ==
Under the release/ directory you should find two jar files, aima-core.jar and aima-gui.jar, ensure these are on your CLASSPATH, the different GUI programs that can be run using these are:
Expand Down Expand Up @@ -61,6 +55,15 @@ The following command line demos can be run as well:


= Change History (Update in reverse chronological order) =
1.1.0-JavaFX GUIs Added : 18 Dec 2016 :<br>
* Java FX based GUIs added.
* Simulated Annealing, FX based, Application Added.
* Genetic Algorithm, FX based, Application Added.
* Updated to work with the latest version of aima-core (0.12.0).
* Search Framework improvements.
* Bidirectional Search options added to GUI demo applications.
* Monte Carlo Localization (MCL), Swing based, Application Added.

1.0.9-Chp 7 Rewrite Support : 10 Aug 2014 :<br>
* Updated to work with the latest version of aima-core (0.11.0).

Expand Down
2 changes: 1 addition & 1 deletion aima-gui/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# b) Use -Dproperty=value arguments

# VERSION
aima-gui.version=1.1.0
aima-gui.version=1.1.1
# DIRECTORY LOCATIONS
path.to.aima-core.project=../aima-core
aima-gui.dir.src=${aima-gui.basedir}/src
Expand Down
4 changes: 2 additions & 2 deletions aima-gui/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

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

<property name="aima-gui.run" value="aima.gui.swing.applications.IntegratedAimaApp" />
<property name="aima-gui.run" value="aima.gui.fx.applications.IntegratedAimaFxApp" />

<path id="aima-gui.classpath">
<path refid="aima-core.classpath" />
Expand Down Expand Up @@ -53,7 +53,7 @@
<jar destfile="${aima-gui.dir.build.release}/aima-gui.jar">
<manifest>
<attribute name="Class-Path" value="aima-core.jar" />
<attribute name="Main-Class" value="aima.gui.applications.AimaDemoApp" />
<attribute name="Main-Class" value="aima.gui.fx.applications.IntegratedAimaFxApp" />
<attribute name="Implementation-Title" value="AIMA-GUI" />
<attribute name="Implementation-Version" value="${aima-gui.version}" />
<attribute name="AIMA-GUI-Version" value="${aima-gui.version}" />
Expand Down
13 changes: 8 additions & 5 deletions aimax-osm/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,9 @@ for navigation, mark setting, and track definition. For routing, at least two
markers must be set.


== Current Release: 2.1.0-AIMAX-OSM JavaFX GUIs Added ==
2.1.0-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
* JavaFX GUIs Added.
* Reverse map problem generation improved.
* Minor documentation improvements.
== Current Release: 2.1.1-AIMAX-OSM JavaFX GUIs Added ==
2.1.1-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
* Fixed Jar to launch JavaFX Integrated App by default.

== Keywords ==

Expand Down Expand Up @@ -154,6 +152,11 @@ program argument -screensize=xx (with xx screen size in inch)


= Change History (Update in reverse chronological order) =
2.1.0-AIMAX-OSM JavaFX GUIs Added : 18 Dec 2016 :<br>
* JavaFX GUIs Added.
* Reverse map problem generation improved.
* Minor documentation improvements.

2.0.3-AIMAX-OSM Small Improvements : 10 Aug 2014 :<br>
* One way arrows added.
* Map renderer is now platform independent. Can also be used for Android. Beta Version!
Expand Down
2 changes: 1 addition & 1 deletion aimax-osm/build.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# b) Use -Dproperty=value arguments

# VERSION
aimax-osm.version=2.1.0
aimax-osm.version=2.1.1
# DIRECTORY LOCATIONS
path.to.aima-gui.project=../aima-gui
aimax-osm.dir.src=${aimax-osm.basedir}/src
Expand Down
4 changes: 2 additions & 2 deletions aimax-osm/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

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

<property name="aimax-osm.run" value="aimax.osm.gui.swing.IntegratedAimaOsmApp" />
<property name="aimax-osm.run" value="aimax.osm.gui.fx.IntegratedAimaOsmFxApp" />

<path id="aimax-osm.classpath">
<path refid="aima-gui.classpath" />
Expand Down Expand Up @@ -53,7 +53,7 @@
<jar destfile="${aimax-osm.dir.build.release}/aimax-osm.jar">
<manifest>
<attribute name="Class-Path" value="aima-gui.jar commons-compress-1.1.jar" />
<attribute name="Main-Class" value="aimax.osm.gui.swing.applications.OsmViewerApp" />
<attribute name="Main-Class" value="aimax.osm.gui.fx.IntegratedAimaOsmFxApp" />
<attribute name="Implementation-Title" value="AIMAX-OSM" />
<attribute name="Implementation-Version" value="${aimax-osm.version}" />
<attribute name="AIMAX-OSM-Version" value="${aimax-osm.version}" />
Expand Down

1 comment on commit a89b8d2

@Nkongnenwi
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi all
Please i really need to understand the scope of work to be done here, can someone try to explain the concept of trying to fix the jar file, because i am kind of lost but will like to know more about it an possibly work on the project.

Please sign in to comment.