Permalink
Browse files

Moved regressions to their own directory; Removed uncessary jars.

  • Loading branch information...
1 parent 13a829d commit 3e4969fe26cc0742ecc39f5b10d5ffd11ec73fed @lintool committed Feb 24, 2011
Showing with 86 additions and 23 deletions.
  1. +18 −0 .classpath
  2. +6 −0 .gitignore
  3. +17 −0 .project
  4. +42 −8 build.xml
  5. +0 −6 etc/junit.sh
  6. +0 −6 etc/run.sh
  7. BIN packages/bliki-core-3.0.14.jar
  8. BIN packages/bzip2.jar
  9. BIN packages/collections-generic-4.01.jar
  10. BIN packages/commons-cli-1.2.jar
  11. BIN packages/hadoop-0.20.1+133-mrunit.jar
  12. BIN packages/je-3.3.87.jar
  13. BIN packages/jsc.jar
  14. BIN packages/jung-algorithms-2.0.1.jar
  15. BIN packages/jung-api-2.0.1.jar
  16. BIN packages/jung-graph-impl-2.0.1.jar
  17. BIN packages/maxent-3.0.0.jar
  18. BIN packages/memcached-2.2.jar
  19. BIN packages/opennlp-tools-1.5.0.jar
  20. BIN packages/ostermillerutils_1_07_00.jar
  21. BIN packages/spy-2.4.jar
  22. BIN packages/ssj.jar
  23. BIN packages/weka.jar
  24. 0 src/java/{test → regression}/ivory/regression/Gov2_Basic.java
  25. 0 src/java/{test → regression}/ivory/regression/Gov2_CIKM2010_Desc_Indep.java
  26. 0 src/java/{test → regression}/ivory/regression/Gov2_CIKM2010_Desc_Joint.java
  27. 0 src/java/{test → regression}/ivory/regression/Gov2_CIKM2010_Title_Indep.java
  28. 0 src/java/{test → regression}/ivory/regression/Gov2_CIKM2010_Title_Joint.java
  29. 0 src/java/{test → regression}/ivory/regression/Gov2_SIGIR2010.java
  30. 0 src/java/{test → regression}/ivory/regression/GroundTruth.java
  31. 0 src/java/{test → regression}/ivory/regression/RegressionUtils.java
  32. 0 src/java/{test → regression}/ivory/regression/Robust04_Basic.java
  33. 0 src/java/{test → regression}/ivory/regression/Robust04_Basic_LCE.java
  34. 0 src/java/{test → regression}/ivory/regression/Robust04_WSD.java
  35. 0 src/java/{test → regression}/ivory/regression/Robust04_WSD_LCE.java
  36. 0 src/java/{test → regression}/ivory/regression/Web09catB_All.java
  37. 0 src/java/{test → regression}/ivory/regression/Web09catB_All_Spam.java
  38. 0 src/java/{test → regression}/ivory/regression/Web09catB_Baseline.java
  39. 0 src/java/{test → regression}/ivory/regression/Web09catB_CIKM2010_Desc_Indep.java
  40. 0 src/java/{test → regression}/ivory/regression/Web09catB_CIKM2010_Desc_Joint.java
  41. 0 src/java/{test → regression}/ivory/regression/Web09catB_CIKM2010_Title_Indep.java
  42. 0 src/java/{test → regression}/ivory/regression/Web09catB_CIKM2010_Title_Joint.java
  43. 0 src/java/{test → regression}/ivory/regression/Web09catB_SIGIR2010.java
  44. +3 −3 src/java/{test → regression}/ivory/regression/Wt10g_Basic.java
  45. 0 src/java/{test → regression}/ivory/regression/Wt10g_CIKM2010_Desc_Indep.java
  46. 0 src/java/{test → regression}/ivory/regression/Wt10g_CIKM2010_Desc_Joint.java
  47. 0 src/java/{test → regression}/ivory/regression/Wt10g_CIKM2010_Title_Indep.java
  48. 0 src/java/{test → regression}/ivory/regression/Wt10g_CIKM2010_Title_Joint.java
  49. 0 src/java/{test → regression}/ivory/regression/Wt10g_SIGIR2010.java
View
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/java/main"/>
+ <classpathentry kind="src" path="src/java/regression"/>
+ <classpathentry kind="src" path="src/java/test"/>
+ <classpathentry kind="lib" path="packages/cloud9.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="packages/guava-r07.jar"/>
+ <classpathentry kind="lib" path="packages/hadoop-0.20.1-core.jar"/>
+ <classpathentry kind="lib" path="packages/commons-logging-1.1.jar"/>
+ <classpathentry kind="lib" path="packages/log4j-1.2.13.jar"/>
+ <classpathentry kind="lib" path="packages/jetty-6.1.14.jar"/>
+ <classpathentry kind="lib" path="packages/jetty-util-6.1.14.jar"/>
+ <classpathentry kind="lib" path="packages/servlet-api-2.5-6.1.14.jar"/>
+ <classpathentry kind="lib" path="packages/junit-4.4.jar"/>
+ <classpathentry kind="lib" path="packages/xercesImpl.jar"/>
+ <classpathentry kind="output" path="build"/>
+</classpath>
View
@@ -0,0 +1,6 @@
+*~
+.*crc
+build/
+docs/api/
+regression-quick/
+ivory.jar
View
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Ivory</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
View
@@ -4,6 +4,8 @@
<property name="src" location="src" />
<property name="build" location="build" />
<property name="test" location="test" />
+ <property name="regression-complete" location="regression-complete" />
+ <property name="regression-quick" location="regression-quick" />
<path id="classpath">
<fileset dir=".">
@@ -35,6 +37,8 @@
</javac>
<javac classpathref="classpath" srcdir="${src}/java/test" destdir="${build}" optimize="on" debug="on">
</javac>
+ <javac classpathref="classpath" srcdir="${src}/java/regression" destdir="${build}" optimize="on" debug="on">
+ </javac>
<!-- javac classpathref="classpath" srcdir="${src}/sandbox" destdir="${build}" optimize="on" debug="on" -->
<!-- compilerarg value="-Xlint:unchecked"/ uncomment this to check for generics -->
<!-- /javac -->
@@ -72,7 +76,7 @@
<batchtest todir="${test}">
<fileset dir="${build}">
<include name="**/*Test.class" />
- <include name="ivory/regression/*.class" />
+ <exclude name="ivory/regression/*.class" />
<exclude name="ivory/regression/GroundTruth*.class" />
<exclude name="ivory/regression/RegressionUtils.class" />
</fileset>
@@ -86,19 +90,49 @@
<report format="noframes" styledir="etc/" todir="${test}" />
</junitreport>
- <mail messageMimeType="text/html" messageFile="${test}/junit-noframes.html" tolist="umd-ivory@googlegroups.com" subject= "JUnit Test Results: Ivory" mailhost="smtp.umiacs.umd.edu" from= "jimmylin@umd.edu" />
+ <!-- mail messageMimeType="text/html" messageFile="${test}/junit-noframes.html" tolist="umd-ivory@googlegroups.com" subject= "JUnit Test Results: Ivory" mailhost="smtp.umiacs.umd.edu" from= "jimmylin@umd.edu" / -->
+
+ </target>
+
+ <target name="regression-quick" depends="lib" description="Run regression tests">
+ <mkdir dir="${regression-quick}" />
+ <junit printsummary="yes" fork="yes" maxmemory="2048m">
+ <sysproperty key="java.library.path" path="${lib}" />
+ <sysproperty key="org.xml.sax.driver" value="org.apache.xerces.parsers.SAXParser" />
+ <classpath refid="classpath" />
+
+ <formatter type="xml" />
+ <batchtest todir="${regression-quick}">
+ <fileset dir="${build}">
+ <include name="ivory/regression/Robust04_Basic.class" />
+ <include name="ivory/regression/Robust04_WSD.class" />
+ <include name="ivory/regression/Wt10g_Basic.class" />
+ <include name="ivory/regression/Gov2_Basic.class" />
+ <include name="ivory/regression/Web09catB_All.class" />
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <junitreport todir="${regression-quick}">
+ <fileset dir="${regression-quick}">
+ <include name="TEST-*.xml" />
+ </fileset>
+ <report format="noframes" styledir="etc/" todir="${regression-quick}" />
+ </junitreport>
+
+ <!-- mail messageMimeType="text/html" messageFile="${test}/junit-noframes.html" tolist="umd-ivory@googlegroups.com" subject= "JUnit Test Results: Ivory" mailhost="smtp.umiacs.umd.edu" from= "jimmylin@umd.edu" / -->
</target>
<target name="javadoc">
<javadoc destdir="docs/api/" access="public" use="false" notree="false" nonavbar="false" noindex="false" splitindex="no" author="true" version="true" nodeprecatedlist="true" nodeprecated="true" classpathref="classpath">
<fileset dir="src">
- <include name="dist/**/*.java" />
- <exclude name="dist/ivory/util/AnnotateClueRunAllWithURLs.java" />
- <exclude name="dist/ivory/util/AnnotateClueRunWithURLs.java" />
- <exclude name="dist/**/*Test.java" />
- <exclude name="dist/uk/**/*.java" />
- <exclude name="dist/org/**/*.java" />
+ <include name="java/main/**/*.java" />
+ <exclude name="java/main/ivory/util/AnnotateClueRunAllWithURLs.java" />
+ <exclude name="java/main/ivory/util/AnnotateClueRunWithURLs.java" />
+ <exclude name="java/main/**/*Test.java" />
+ <exclude name="java/main/uk/**/*.java" />
+ <exclude name="java/main/org/**/*.java" />
</fileset>
<link href="http://java.sun.com/javase/6/docs/api/" />
<link href="http://hadoop.apache.org/common/docs/current/api/" />
View
@@ -1,6 +0,0 @@
-#!/bin/sh
-if test -s ~/.bashrc
-then
-source ~/.bashrc
-fi
-java -Xmx2g -classpath "/Users/jimmy/workspace/ivory-export/ivory.jar:/Users/jimmy/workspace/ivory-export/packages/bliki-core-3.0.14.jar:/Users/jimmy/workspace/ivory-export/packages/bzip2.jar:/Users/jimmy/workspace/ivory-export/packages/cloud9.jar:/Users/jimmy/workspace/ivory-export/packages/collections-generic-4.01.jar:/Users/jimmy/workspace/ivory-export/packages/commons-cli-1.2.jar:/Users/jimmy/workspace/ivory-export/packages/commons-logging-1.1.jar:/Users/jimmy/workspace/ivory-export/packages/guava-r07.jar:/Users/jimmy/workspace/ivory-export/packages/hadoop-0.20.1+133-mrunit.jar:/Users/jimmy/workspace/ivory-export/packages/hadoop-0.20.1-core.jar:/Users/jimmy/workspace/ivory-export/packages/je-3.3.87.jar:/Users/jimmy/workspace/ivory-export/packages/jetty-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/jetty-util-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/jsc.jar:/Users/jimmy/workspace/ivory-export/packages/jung-algorithms-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/jung-api-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/jung-graph-impl-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/junit-4.4.jar:/Users/jimmy/workspace/ivory-export/packages/log4j-1.2.13.jar:/Users/jimmy/workspace/ivory-export/packages/maxent-3.0.0.jar:/Users/jimmy/workspace/ivory-export/packages/memcached-2.2.jar:/Users/jimmy/workspace/ivory-export/packages/opennlp-tools-1.5.0.jar:/Users/jimmy/workspace/ivory-export/packages/ostermillerutils_1_07_00.jar:/Users/jimmy/workspace/ivory-export/packages/servlet-api-2.5-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/spy-2.4.jar:/Users/jimmy/workspace/ivory-export/packages/ssj.jar:/Users/jimmy/workspace/ivory-export/packages/weka.jar:/Users/jimmy/workspace/ivory-export/packages/xercesImpl.jar" org.junit.runner.JUnitCore $1
View
@@ -1,6 +0,0 @@
-#!/bin/sh
-if test -s ~/.bashrc
-then
-source ~/.bashrc
-fi
-java -Xmx2g -classpath "/Users/jimmy/workspace/ivory-export/ivory.jar:/Users/jimmy/workspace/ivory-export/packages/bliki-core-3.0.14.jar:/Users/jimmy/workspace/ivory-export/packages/bzip2.jar:/Users/jimmy/workspace/ivory-export/packages/cloud9.jar:/Users/jimmy/workspace/ivory-export/packages/collections-generic-4.01.jar:/Users/jimmy/workspace/ivory-export/packages/commons-cli-1.2.jar:/Users/jimmy/workspace/ivory-export/packages/commons-logging-1.1.jar:/Users/jimmy/workspace/ivory-export/packages/guava-r07.jar:/Users/jimmy/workspace/ivory-export/packages/hadoop-0.20.1+133-mrunit.jar:/Users/jimmy/workspace/ivory-export/packages/hadoop-0.20.1-core.jar:/Users/jimmy/workspace/ivory-export/packages/je-3.3.87.jar:/Users/jimmy/workspace/ivory-export/packages/jetty-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/jetty-util-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/jsc.jar:/Users/jimmy/workspace/ivory-export/packages/jung-algorithms-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/jung-api-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/jung-graph-impl-2.0.1.jar:/Users/jimmy/workspace/ivory-export/packages/junit-4.4.jar:/Users/jimmy/workspace/ivory-export/packages/log4j-1.2.13.jar:/Users/jimmy/workspace/ivory-export/packages/maxent-3.0.0.jar:/Users/jimmy/workspace/ivory-export/packages/memcached-2.2.jar:/Users/jimmy/workspace/ivory-export/packages/opennlp-tools-1.5.0.jar:/Users/jimmy/workspace/ivory-export/packages/ostermillerutils_1_07_00.jar:/Users/jimmy/workspace/ivory-export/packages/servlet-api-2.5-6.1.14.jar:/Users/jimmy/workspace/ivory-export/packages/spy-2.4.jar:/Users/jimmy/workspace/ivory-export/packages/ssj.jar:/Users/jimmy/workspace/ivory-export/packages/weka.jar:/Users/jimmy/workspace/ivory-export/packages/xercesImpl.jar" $1 $2 $3 $4 $5 $6 $7 $8 $9
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
@@ -307,11 +307,11 @@ public void runRegression() throws Exception {
h.put("wt10g-bm25-sd", new GroundTruth(Metric.P10, 99, sBm25SDRawP10, 0.3333f));
h.put("wt10g-bm25-fd", new GroundTruth(Metric.P10, 99, sBm25FDRawP10, 0.3424f));
- Qrels qrels = new Qrels("docs/data/wt10g/qrels.wt10g");
+ Qrels qrels = new Qrels("docs/data/wt10g/qrels.wt10g.all");
String[] params = new String[] { "docs/data/wt10g/run.wt10g.basic.xml",
- "docs/data/wt10g/wt10g_queries_451-500.xml",
- "docs/data/wt10g/wt10g_queries_501-550.xml" };
+ "docs/data/wt10g/queries.wt10g.451-500.xml",
+ "docs/data/wt10g/queries.wt10g.501-550.xml" };
FileSystem fs = FileSystem.getLocal(new Configuration());

0 comments on commit 3e4969f

Please sign in to comment.