From 6f9960d4b8a265e66b3821116db33f0ca8333d52 Mon Sep 17 00:00:00 2001
From: Jonathan Chen <ypeels@users.noreply.github.com>
Date: Tue, 19 Jan 2016 13:44:40 -0600
Subject: [PATCH 1/2] fix regression for calling multeval.sh from other
 directories

---
 build.xml                  | 11 +++++++----
 src/multeval/MultEval.java |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index ce5ac59..2c17861 100644
--- a/build.xml
+++ b/build.xml
@@ -42,14 +42,17 @@
       <zipfileset src="lib/jannopts.jar" excludes="META-INF/*" />
       <zipfileset src="lib/guava-11.0.jar" excludes="META-INF/*" />
 
-<!-- JARs are braindead regarding CLASSPATH
       <manifest>
-	<attribute name="Main-Class"
-		   value="multeval.MultEval"/>
+        <attribute name="Main-Class"
+		       value="multeval.MultEval"/>
+        <attribute name="Implementation-Version" 
+              value="${version}"/> 
+<!-- JARs are braindead regarding CLASSPATH
 	<attribute name="Class-Path"
 		   value="lib/tercom-0.7.26.jar:lib/meteor-1.2/meteor-1.2.jar"/>
-      </manifest>
 -->
+      </manifest>
+
     </jar>
   </target>
 </project>
diff --git a/src/multeval/MultEval.java b/src/multeval/MultEval.java
index 2acf795..bdc2a99 100644
--- a/src/multeval/MultEval.java
+++ b/src/multeval/MultEval.java
@@ -82,7 +82,7 @@ private static String loadVersion() throws IOException {
 	public static void main(String[] args) throws ConfigurationException, IOException,
 			InterruptedException {
 
-            String version = loadVersion();
+            String version = MultEval.class.getPackage().getImplementationVersion(); //loadVersion();
             System.err.println(String.format("MultEval V%s\n", version) +
                                "By Jonathan Clark\n" +
                                "Using Libraries: METEOR (Michael Denkowski) and TER (Matthew Snover)\n");

From 2fdcd886186567d6431c19f6bc0de4a60d5dba6b Mon Sep 17 00:00:00 2001
From: Jonathan Chen <ypeels@users.noreply.github.com>
Date: Fri, 22 Jan 2016 09:24:53 -0600
Subject: [PATCH 2/2] commented out unused function loadVersion()

---
 src/multeval/MultEval.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/multeval/MultEval.java b/src/multeval/MultEval.java
index bdc2a99..95f3a7e 100644
--- a/src/multeval/MultEval.java
+++ b/src/multeval/MultEval.java
@@ -70,19 +70,19 @@ static int initThreads(final List<Metric<?>> metrics, int threads) {
 		return threads;
 	}
 
-        private static String loadVersion() throws IOException {
-            Properties props = new Properties();
-            FileInputStream in = new FileInputStream("constants");
-            props.load(in);
-            in.close();
-            String version = props.getProperty("version");
-            return version;
-        }
+//        private static String loadVersion() throws IOException {
+//            Properties props = new Properties();
+//            FileInputStream in = new FileInputStream("constants");
+//            props.load(in);
+//            in.close();
+//            String version = props.getProperty("version");
+//            return version;
+//        }
 
 	public static void main(String[] args) throws ConfigurationException, IOException,
 			InterruptedException {
 
-            String version = MultEval.class.getPackage().getImplementationVersion(); //loadVersion();
+            String version = MultEval.class.getPackage().getImplementationVersion();
             System.err.println(String.format("MultEval V%s\n", version) +
                                "By Jonathan Clark\n" +
                                "Using Libraries: METEOR (Michael Denkowski) and TER (Matthew Snover)\n");