Skip to content
Snippets Groups Projects
Commit 3d0ce708 authored by Jeffrey Phillips Freeman's avatar Jeffrey Phillips Freeman :boom:
Browse files

Completely reorganized lib directory, and build.xml files. also moved jaxb over to jaxb2 commons

parent bb1f3e9c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
build.xml
+ 74
− 79
View file @ 3d0ce708
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="dANN Examples" default="all" basedir="."> <project name="dANN Examples" default="all" basedir=".">
<path id="classpath.ant">
<fileset dir="lib/ant" includes="**/*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="dann.jar"/>
</path>
<path id="classpath.build">
<fileset dir="lib/build" includes="**/*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="dann.jar"/>
</path>
<path id="classpath.test">
<fileset dir="lib/test" includes="**/*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="**/dann.jar"/>
<fileset dir="build/jar" includes="dann_examples.jar"/>
<fileset dir="build/jar" includes="dann_examples-tests.jar"/>
</path>
<path id="classpath.run">
<fileset dir="lib/run" includes="**/*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="dann.jar"/>
<fileset dir="build/jar" includes="dann_examples.jar"/>
</path>
<taskdef name="lint4j" classname="com.jutils.lint4j.ant.Lint4jAntTask"> <taskdef name="lint4j" classname="com.jutils.lint4j.ant.Lint4jAntTask">
<classpath> <classpath>
<pathelement location="lib/lint/lint4j.jar"/> <fileset dir="lib/ant/lint">
<include name="**/*.jar"/>
</fileset>
</classpath> </classpath>
</taskdef> </taskdef>
<taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask"> <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
<classpath> <classpath>
<pathelement location="lib/findbugs/findbugs-ant.jar"/> <fileset dir="lib/ant/findbugs">
<pathelement location="lib/findbugs/bcel.jar"/> <include name="**/*.jar"/>
<pathelement location="lib/findbugs/dom4j-1.6.1.jar"/> </fileset>
<pathelement location="lib/findbugs/jFormatString.jar"/>
<pathelement location="lib/findbugs/asm-3.1.jar"/>
<pathelement location="lib/findbugs/asm-commons-3.1.jar"/>
<pathelement location="lib/findbugs/asm-tree-3.1.jar"/>
<pathelement location="lib/findbugs/jsr305.jar"/>
<pathelement location="lib/findbugs/commons-lang-2.4.jar"/>
</classpath> </classpath>
</taskdef> </taskdef>
<taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask"> <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
<classpath> <classpath>
<pathelement location="lib/checkstyle/checkstyle-5.0.jar"/> <fileset dir="lib/ant/checkstyle">
<pathelement location="lib/checkstyle/commons-beanutils-core.jar"/> <include name="**/*.jar"/>
<pathelement location="lib/checkstyle/commons-cli-1.1.jar"/> </fileset>
<pathelement location="lib/checkstyle/commons-logging.jar"/>
<pathelement location="lib/checkstyle/antlr.jar"/>
<pathelement location="lib/checkstyle/google-collect-snapshot-20090211.jar"/>
</classpath> </classpath>
</taskdef> </taskdef>
<taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"> <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask">
<classpath> <classpath>
<pathelement location="lib/pmd/pmd-4.1.jar"/> <fileset dir="lib/ant/pmd">
<pathelement location="lib/pmd/jaxen-1.1.1.jar"/> <include name="**/*.jar"/>
<pathelement location="lib/pmd/asm-3.1.jar"/> </fileset>
<pathelement location="lib/pmd/junit-4.4.jar"/>
</classpath> </classpath>
</taskdef> </taskdef>
<path id="classpath"> <target name="clean" description="Cleans the build environment">
<fileset dir="lib" includes="**/*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="**/dann.jar"/>
</path>
<path id="classpath.run">
<fileset dir="lib" includes="*.jar"/>
<fileset dir="lib" includes="dann.jar"/>
<fileset dir="../java_dann/build/jar" includes="**/dann.jar"/>
</path>
<target name="clean">
<delete dir="build"/> <delete dir="build"/>
</target> </target>
<target name="javadoc"> <target name="javadoc" description="Generate javadocs from code">
<mkdir dir="build/javadoc"/> <mkdir dir="build/javadoc"/>
<delete includeemptydirs="true"> <delete includeemptydirs="true">
<fileset dir="build/javadoc" includes="**/*"/> <fileset dir="build/javadoc" includes="**/*"/>
</delete> </delete>
<javadoc Private="true" destdir="build/javadoc/" classpathref="classpath"> <javadoc Private="true" destdir="build/javadoc/" classpathref="classpath.build">
<fileset dir="src/" includes="**/*.java"/> <fileset dir="src/" includes="**/*.java"/>
</javadoc> </javadoc>
</target> </target>
...@@ -75,12 +80,7 @@ ...@@ -75,12 +80,7 @@
</dirset> </dirset>
<pathelement path="src/" /> <pathelement path="src/" />
</sourcepath> </sourcepath>
<classpath> <classpath refid="classpath.build"/>
<fileset dir="lib/">
<include name="**/*.jar" />
</fileset>
<pathelement location="../java_dann/build/jar/dann.jar"/>
</classpath>
<formatters> <formatters>
<formatter type="text" /> <formatter type="text" />
<formatter type="xml" toFile="build/lint/all.xml"/> <formatter type="xml" toFile="build/lint/all.xml"/>
...@@ -89,9 +89,9 @@ ...@@ -89,9 +89,9 @@
</target> </target>
<target name="compile"> <target name="compile" description="compile class files">
<mkdir dir="build/classes"/> <mkdir dir="build/classes"/>
<javac destdir="build/classes" classpathref="classpath" debug="true" excludes="com/syncleus/tests/**"> <javac destdir="build/classes" classpathref="classpath.build" debug="true" excludes="com/syncleus/tests/**">
<compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/> <compilerarg value="-Xlint:unchecked"/>
<src path="src/com"/> <src path="src/com"/>
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
<copy file="log4j.xml" todir="build/classes"/> <copy file="log4j.xml" todir="build/classes"/>
<mkdir dir="build/jar"/> <mkdir dir="build/jar"/>
<manifestclasspath property="manifest.classpath" jarfile="./dann_examples.jar" maxParentLevels="100"> <manifestclasspath property="manifest.classpath" jarfile="./dann_examples.jar" maxParentLevels="100">
<!-- TODO this isnt correct -->
<classpath refid="classpath.run" /> <classpath refid="classpath.run" />
</manifestclasspath> </manifestclasspath>
<jar destfile="build/jar/dann_examples.jar" basedir="build/classes"> <jar destfile="build/jar/dann_examples.jar" basedir="build/classes">
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
</jar> </jar>
<mkdir dir="build/tests/classes"/> <mkdir dir="build/tests/classes"/>
<javac destdir="build/tests/classes" classpathref="classpath" debug="true"> <javac destdir="build/tests/classes" classpathref="classpath.build" debug="true">
<compilerarg value="-Xlint:deprecation"/> <compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/> <compilerarg value="-Xlint:unchecked"/>
<src path="src/com"/> <src path="src/com"/>
...@@ -145,9 +146,9 @@ ...@@ -145,9 +146,9 @@
</target> </target>
<target name="compile-warnings"> <target name="compile-warnings" description="compile class files and display all warnings">
<mkdir dir="build/classes"/> <mkdir dir="build/classes"/>
<javac destdir="build/classes" classpathref="classpath" debug="true" excludes="com/syncleus/tests/**"> <javac destdir="build/classes" classpathref="classpath.build" debug="true" excludes="com/syncleus/tests/**">
<compilerarg value="-Xlint"/> <compilerarg value="-Xlint"/>
<src path="src/com"/> <src path="src/com"/>
</javac> </javac>
...@@ -158,7 +159,6 @@ ...@@ -158,7 +159,6 @@
</manifestclasspath> </manifestclasspath>
<jar destfile="build/jar/dann_examples.jar" basedir="build/classes"> <jar destfile="build/jar/dann_examples.jar" basedir="build/classes">
<manifest> <manifest>
<attribute name="Main-Class" value="com.syncleus.core.dann.examples.Main"/>
<attribute name="Main-Class" value="com.syncleus.core.dann.examples.Main"/> <attribute name="Main-Class" value="com.syncleus.core.dann.examples.Main"/>
<attribute name="Class-Path" value="${manifest.classpath}"/> <attribute name="Class-Path" value="${manifest.classpath}"/>
<attribute name="Product-Name" value="dANN"/> <attribute name="Product-Name" value="dANN"/>
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
</jar> </jar>
<mkdir dir="build/tests/classes"/> <mkdir dir="build/tests/classes"/>
<javac destdir="build/tests/classes" classpathref="classpath" debug="true"> <javac destdir="build/tests/classes" classpathref="classpath.build" debug="true">
<compilerarg value="-Xlint"/> <compilerarg value="-Xlint"/>
<src path="src/com"/> <src path="src/com"/>
</javac> </javac>
...@@ -199,33 +199,29 @@ ...@@ -199,33 +199,29 @@
</jar> </jar>
</target> </target>
<target name="all"> <target name="all" description="clean, javadoc, then compile">
<antcall target="clean"/> <antcall target="clean"/>
<antcall target="javadoc"/> <antcall target="javadoc"/>
<antcall target="compile"/> <antcall target="compile"/>
</target> </target>
<target name="run"> <target name="run" description="run the application after it has been built">
<java fork="true" classname="com.syncleus.core.dann.examples.Main"> <java fork="true" classname="com.syncleus.core.dann.examples.Main">
<jvmarg value="-Xmx512m" /> <jvmarg value="-Xmx512m" />
<classpath> <classpath refid="classpath.run"/>
<path refid="classpath.run"/>
<path location="build/jar/dann_examples.jar"/>
</classpath>
</java> </java>
</target> </target>
<target name="run-tests"> <!-- TODO remove this target as well as the code it runs -->
<target name="run-tests" description="this is a temporary target that will be removed, tests some experimental code">
<java fork="true" classname="com.syncleus.core.dann.examples.test.Test3d"> <java fork="true" classname="com.syncleus.core.dann.examples.test.Test3d">
<jvmarg value="-Xmx512m" /> <jvmarg value="-Xmx512m" />
<classpath> <classpath refid="classpath.test"/>
<path refid="classpath.run"/>
<path location="build/jar/dann_examples.jar"/>
</classpath>
</java> </java>
</target> </target>
<target name="profile"> <!-- TODO this shouldnt be netbeans specific -->
<target name="profile" description="run the netbeans profiler on this application as it runs">
<nbprofiledirect> <nbprofiledirect>
<classpath> <classpath>
<path refid="classpath.run"/> <path refid="classpath.run"/>
...@@ -235,29 +231,32 @@ ...@@ -235,29 +231,32 @@
<java fork="true" classname="com.syncleus.core.dann.examples.Main"> <java fork="true" classname="com.syncleus.core.dann.examples.Main">
<jvmarg value="${profiler.info.jvmargs.agent}"/> <jvmarg value="${profiler.info.jvmargs.agent}"/>
<jvmarg value="-Xmx512m" /> <jvmarg value="-Xmx512m" />
<classpath> <classpath refid="classpath.run"/>
<path refid="classpath.run"/>
<path location="build/jar/dann_examples.jar"/>
</classpath>
</java> </java>
</target> </target>
<target name="findbugs"> <!-- TODO remove org.jDesktop.* as a dependency -->
<target name="findbugs" description="run findbugs check on built jar writing output to a log file">
<mkdir dir="build/findbugs"/> <mkdir dir="build/findbugs"/>
<findbugs home="lib/findbugs/" <findbugs home="lib/ant/findbugs/"
output="xml" output="xml"
outputFile="build/findbugs/findbugs-report.xml" > outputFile="build/findbugs/findbugs-report.xml" >
<auxClasspath path="lib/j3dcore.jar"/> <auxClasspath path="lib/run/java3d/j3dcore.jar"/>
<auxClasspath path="lib/freehep-j3d.jar"/> <auxClasspath path="lib/run/java3d/freehep/freehep-j3d.jar"/>
<auxClasspath path="lib/j3dutils.jar"/> <auxClasspath path="lib/run/java3d/j3dutils.jar"/>
<auxClasspath path="lib/vecmath.jar"/> <auxClasspath path="lib/run/java3d/vecmath.jar"/>
<auxClasspath path="lib/test/junit/junit-4.6.jar"/>
<auxClasspath path="lib/test/junit/fest/fest-swing-1.2a2.jar"/>
<auxClasspath path="lib/test/junit/fest/fest-reflect-1.1.jar"/>
<auxClasspath path="lib/run/jaxb/jaxb2-basics-runtime-0.5.3.jar"/>
<auxClasspath path="lib/run/log4j/log4j-1.2.15.jar"/>
<auxClasspath path="../java_dann/build/jar/dann.jar"/> <auxClasspath path="../java_dann/build/jar/dann.jar"/>
<sourcePath path="src/" /> <sourcePath path="src/" />
<class location="build/jar/dann_examples.jar" /> <class location="build/jar/dann_examples.jar" />
</findbugs> </findbugs>
</target> </target>
<target name="checkstyle"> <target name="checkstyle" description="run checkstyle checks on the source code">
<mkdir dir="build/checkstyle"/> <mkdir dir="build/checkstyle"/>
<checkstyle config="checks.xml" maxErrors="2147483647"> <checkstyle config="checks.xml" maxErrors="2147483647">
<fileset dir="src" includes="**/*.java"/> <fileset dir="src" includes="**/*.java"/>
...@@ -266,7 +265,7 @@ ...@@ -266,7 +265,7 @@
</checkstyle> </checkstyle>
</target> </target>
<target name="pmd"> <target name="pmd" description="run pmd checks on the source code">
<mkdir dir="build/pmd"/> <mkdir dir="build/pmd"/>
<pmd rulesetfiles="pmd.xml"> <pmd rulesetfiles="pmd.xml">
<formatter type="xml" toFile="build/pmd/pmd-report.xml"/> <formatter type="xml" toFile="build/pmd/pmd-report.xml"/>
...@@ -276,14 +275,10 @@ ...@@ -276,14 +275,10 @@
</pmd> </pmd>
</target> </target>
<target name="tests"> <target name="tests" description="run all unit tests without generating coverage information">
<mkdir dir="build/tests"/> <mkdir dir="build/tests"/>
<junit printsummary="yes" haltonfailure="no" showoutput="yes" > <junit printsummary="yes" haltonfailure="no" showoutput="yes" >
<classpath> <classpath refid="classpath.test"/>
<path refid="classpath"/>
<pathelement location="build/jar/dann_examples-tests.jar"/>
<pathelement location="../java_dann/build/jar/dann.jar"/>
</classpath>
<formatter type="xml"/> <formatter type="xml"/>
<batchtest fork="yes" todir="build/tests"> <batchtest fork="yes" todir="build/tests">
<fileset dir="src"> <fileset dir="src">
......
lib @ 0a6dc14a
Subproject commit 6d468f44ca901b1bb72bbcd549ba72f7b6493b96 Subproject commit 0a6dc14a93d8ef58b80c0c8bda16ed92410d29f6
src/com/syncleus/core/dann/examples/pathfind/PathFindDemoPanel.java
+ 0
− 2
View file @ 3d0ce708
...@@ -157,8 +157,6 @@ public class PathFindDemoPanel extends JPanel ...@@ -157,8 +157,6 @@ public class PathFindDemoPanel extends JPanel
} }
// private class SettingsPanel extends JPanel {
// }
private class PathFindControlPanel extends JTabbedPane private class PathFindControlPanel extends JTabbedPane
{ {
......
src/com/syncleus/tests/dann/examples/colormap/TestColorMapDemo.java
+ 5
− 2
View file @ 3d0ce708
...@@ -140,18 +140,20 @@ public class TestColorMapDemo ...@@ -140,18 +140,20 @@ public class TestColorMapDemo
//train and display for various parameters //train and display for various parameters
colorMapDemoFixture.button("trainDisplayButton").requireEnabled(); colorMapDemoFixture.button("trainDisplayButton").requireEnabled();
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("10000");
colorMapDemoFixture.button("trainDisplayButton").click(); colorMapDemoFixture.button("trainDisplayButton").click();
colorMapDemoFixture.button("trainDisplayButton").requireDisabled(); colorMapDemoFixture.button("trainDisplayButton").requireDisabled();
colorMapDemoFixture.button("trainDisplayButton").requireEnabled(Timeout.timeout(30000)); colorMapDemoFixture.button("trainDisplayButton").requireEnabled(Timeout.timeout(30000));
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("1000"); colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("5000");
colorMapDemoFixture.spinner("iterationsSpinner").requireValue(1000); colorMapDemoFixture.spinner("iterationsSpinner").requireValue(5000);
colorMapDemoFixture.button("trainDisplayButton").click(); colorMapDemoFixture.button("trainDisplayButton").click();
colorMapDemoFixture.button("trainDisplayButton").requireDisabled(); colorMapDemoFixture.button("trainDisplayButton").requireDisabled();
colorMapDemoFixture.button("trainDisplayButton").requireEnabled(Timeout.timeout(30000)); colorMapDemoFixture.button("trainDisplayButton").requireEnabled(Timeout.timeout(30000));
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("100"); colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("100");
colorMapDemoFixture.spinner("iterationsSpinner").requireValue(100); colorMapDemoFixture.spinner("iterationsSpinner").requireValue(100);
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("5000");
colorMapDemoFixture.spinner("learningRateSpinner").enterTextAndCommit("0.1"); colorMapDemoFixture.spinner("learningRateSpinner").enterTextAndCommit("0.1");
colorMapDemoFixture.spinner("learningRateSpinner").requireValue(0.1); colorMapDemoFixture.spinner("learningRateSpinner").requireValue(0.1);
colorMapDemoFixture.comboBox("dimentionalityComboBox").selectItem("2D"); colorMapDemoFixture.comboBox("dimentionalityComboBox").selectItem("2D");
...@@ -162,6 +164,7 @@ public class TestColorMapDemo ...@@ -162,6 +164,7 @@ public class TestColorMapDemo
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("250"); colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("250");
colorMapDemoFixture.spinner("iterationsSpinner").requireValue(250); colorMapDemoFixture.spinner("iterationsSpinner").requireValue(250);
colorMapDemoFixture.spinner("iterationsSpinner").enterTextAndCommit("5000");
colorMapDemoFixture.spinner("learningRateSpinner").enterTextAndCommit("1.0"); colorMapDemoFixture.spinner("learningRateSpinner").enterTextAndCommit("1.0");
colorMapDemoFixture.spinner("learningRateSpinner").requireValue(1.0); colorMapDemoFixture.spinner("learningRateSpinner").requireValue(1.0);
colorMapDemoFixture.comboBox("dimentionalityComboBox").selectItem("1D"); colorMapDemoFixture.comboBox("dimentionalityComboBox").selectItem("1D");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment