Upgraded liblinear to 1.8 and use Maven for building

DigitalPebble · Feb 21, 2012 · fefdd40 · fefdd40
1 parent 9335652
commit fefdd40
Show file tree

Hide file tree

Showing 37 changed files with 64 additions and 8 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,6 @@
+1.6
+- upgraded liblinear 1.8
+- uses Maven to build and manage the dependencies
 1.5
 - added parameter to ModelUtils to show only the top N most important attributes per category
 - upgraded lisvm 3.0 + rely on external lib instead of modified code

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -9,5 +9,5 @@ This product includes software developed by the LIBSVM Project.
   Taiwan University (http://www.csie.ntu.edu.tw/~cjlin/libsvm/).
   Copyright (c) 2000-2006 Chih-Chung Chang and Chih-Jen Lin
 
-This product includers software from http://www.bwaldvogel.de/liblinear-java/
+This product includes software from http://www.bwaldvogel.de/liblinear-java/
 
diff --git a/README b/README
@@ -1,4 +1,4 @@
-A Text Classification API in Java originally developed by DigitalPebble Ltd. The API is independent from the ML implementations used and can be used as a front end to various ML algorithms. libSVM and liblinear are currently embedded.
+A Text Classification API in Java originally developed by DigitalPebble Ltd. The API is independent from the ML implementations used and can be used as a front end to various ML algorithms. libSVM and liblinear [https://github.com/bwaldvogel/liblinear-java] are currently embedded.
 
 Standard weighting schemes are provided (occurrences,frequency,tf-idf) for building the vectors. The API aims at facilitating the use of ML for text applications and offers a convenient field-based representation of documents (e.g. title, content, keywords, etc...) with the option to specify a different weighting scheme per field.
 

diff --git a/lib/liblinear-1.7-with-deps.jar b/lib/liblinear-1.7-with-deps.jar
diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,53 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                             http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.digitalpebble.textclassification</groupId>
+    <artifactId>textclassification</artifactId>
+    <packaging>jar</packaging>
+    <version>1.6</version>
+    <name>TextClassificationAPI</name>
+    <url>https://github.com/jnioche/textclassification</url>
+
+ <build>
+        <finalName>TextClassificationAPI-${project.version}</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <dependencies>
+  <dependency>
+	<groupId>de.bwaldvogel</groupId>
+	<artifactId>liblinear</artifactId>
+	<version>1.8</version>
+  </dependency>
+
+  <dependency>
+	<groupId>libsvm</groupId>
+	<artifactId>libsvm</artifactId>
+	<version>3.0</version>
+  </dependency>
+
+ <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.2</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+
+</project>
diff --git a/...igitalpebble/classification/Document.java → ...igitalpebble/classification/Document.java b/...igitalpebble/classification/Document.java → ...igitalpebble/classification/Document.java
diff --git a/...m/digitalpebble/classification/Field.java → ...m/digitalpebble/classification/Field.java b/...m/digitalpebble/classification/Field.java → ...m/digitalpebble/classification/Field.java
diff --git a/...le/classification/FileTrainingCorpus.java → ...le/classification/FileTrainingCorpus.java b/...le/classification/FileTrainingCorpus.java → ...le/classification/FileTrainingCorpus.java
diff --git a/...digitalpebble/classification/Learner.java → ...digitalpebble/classification/Learner.java b/...digitalpebble/classification/Learner.java → ...digitalpebble/classification/Learner.java
diff --git a/...digitalpebble/classification/Lexicon.java → ...digitalpebble/classification/Lexicon.java b/...digitalpebble/classification/Lexicon.java → ...digitalpebble/classification/Lexicon.java
diff --git a/...le/classification/MultiFieldDocument.java → ...le/classification/MultiFieldDocument.java b/...le/classification/MultiFieldDocument.java → ...le/classification/MultiFieldDocument.java
diff --git a/...italpebble/classification/Parameters.java → ...italpebble/classification/Parameters.java b/...italpebble/classification/Parameters.java → ...italpebble/classification/Parameters.java
diff --git a/...ble/classification/RAMTrainingCorpus.java → ...ble/classification/RAMTrainingCorpus.java b/...ble/classification/RAMTrainingCorpus.java → ...ble/classification/RAMTrainingCorpus.java
diff --git a/...pebble/classification/SimpleDocument.java → ...pebble/classification/SimpleDocument.java b/...pebble/classification/SimpleDocument.java → ...pebble/classification/SimpleDocument.java
diff --git a/...pebble/classification/TextClassifier.java → ...pebble/classification/TextClassifier.java b/...pebble/classification/TextClassifier.java → ...pebble/classification/TextClassifier.java
diff --git a/...pebble/classification/TrainingCorpus.java → ...pebble/classification/TrainingCorpus.java b/...pebble/classification/TrainingCorpus.java → ...pebble/classification/TrainingCorpus.java
diff --git a/.../digitalpebble/classification/Vector.java → .../digitalpebble/classification/Vector.java b/.../digitalpebble/classification/Vector.java → .../digitalpebble/classification/Vector.java
diff --git a/...ification/liblinear/LibLinearApplier.java → ...ification/liblinear/LibLinearApplier.java b/...ification/liblinear/LibLinearApplier.java → ...ification/liblinear/LibLinearApplier.java
diff --git a/...cation/liblinear/LibLinearClassifier.java → ...cation/liblinear/LibLinearClassifier.java b/...cation/liblinear/LibLinearClassifier.java → ...cation/liblinear/LibLinearClassifier.java
@@ -4,15 +4,15 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import liblinear.FeatureNode;
-import liblinear.Linear;
-import liblinear.Model;
-
 import com.digitalpebble.classification.Document;
 import com.digitalpebble.classification.Parameters;
 import com.digitalpebble.classification.TextClassifier;
 import com.digitalpebble.classification.Vector;
 
+import de.bwaldvogel.liblinear.FeatureNode;
+import de.bwaldvogel.liblinear.Linear;
+import de.bwaldvogel.liblinear.Model;
+
 public class LibLinearClassifier extends TextClassifier {
 
   Model liblinearModel;

diff --git a/...tion/liblinear/LibLinearModelCreator.java → ...tion/liblinear/LibLinearModelCreator.java b/...tion/liblinear/LibLinearModelCreator.java → ...tion/liblinear/LibLinearModelCreator.java
diff --git a/...assification/libsvm/LibSVMClassifier.java → ...assification/libsvm/LibSVMClassifier.java b/...assification/libsvm/LibSVMClassifier.java → ...assification/libsvm/LibSVMClassifier.java
diff --git a/...sification/libsvm/LibSVMModelCreator.java → ...sification/libsvm/LibSVMModelCreator.java b/...sification/libsvm/LibSVMModelCreator.java → ...sification/libsvm/LibSVMModelCreator.java
diff --git a/...alpebble/classification/libsvm/Utils.java → ...alpebble/classification/libsvm/Utils.java b/...alpebble/classification/libsvm/Utils.java → ...alpebble/classification/libsvm/Utils.java
diff --git a/...bble/classification/util/CorpusUtils.java → ...bble/classification/util/CorpusUtils.java b/...bble/classification/util/CorpusUtils.java → ...bble/classification/util/CorpusUtils.java
diff --git a/...ebble/classification/util/ModelUtils.java → ...ebble/classification/util/ModelUtils.java b/...ebble/classification/util/ModelUtils.java → ...ebble/classification/util/ModelUtils.java
@@ -22,10 +22,10 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import liblinear.Model;
-
 import com.digitalpebble.classification.Lexicon;
 
+import de.bwaldvogel.liblinear.Model;
+
 public class ModelUtils {
 
 	/**

diff --git a/...le/classification/util/PriorityQueue.java → ...le/classification/util/PriorityQueue.java b/...le/classification/util/PriorityQueue.java → ...le/classification/util/PriorityQueue.java
diff --git a/...alpebble/classification/util/Stemmer.java → ...alpebble/classification/util/Stemmer.java b/...alpebble/classification/util/Stemmer.java → ...alpebble/classification/util/Stemmer.java
diff --git a/...italpebble/classification/util/UnZip.java → ...italpebble/classification/util/UnZip.java b/...italpebble/classification/util/UnZip.java → ...italpebble/classification/util/UnZip.java
diff --git a/...ication/util/scorers/AttributeScorer.java → ...ication/util/scorers/AttributeScorer.java b/...ication/util/scorers/AttributeScorer.java → ...ication/util/scorers/AttributeScorer.java
diff --git a/...til/scorers/chiSquareAttributeScorer.java → ...til/scorers/chiSquareAttributeScorer.java b/...til/scorers/chiSquareAttributeScorer.java → ...til/scorers/chiSquareAttributeScorer.java
diff --git a/...scorers/logLikelihoodAttributeScorer.java → ...scorers/logLikelihoodAttributeScorer.java b/...scorers/logLikelihoodAttributeScorer.java → ...scorers/logLikelihoodAttributeScorer.java
diff --git a/...ssification/test/AbstractLearnerTest.java → ...ssification/test/AbstractLearnerTest.java b/...ssification/test/AbstractLearnerTest.java → ...ssification/test/AbstractLearnerTest.java
diff --git a/...assification/test/TestMultiFieldDocs.java → ...assification/test/TestMultiFieldDocs.java b/...assification/test/TestMultiFieldDocs.java → ...assification/test/TestMultiFieldDocs.java
diff --git a/...sification/test/TestNonEuropeanChars.java → ...sification/test/TestNonEuropeanChars.java b/...sification/test/TestNonEuropeanChars.java → ...sification/test/TestNonEuropeanChars.java
diff --git a/...assification/test/TestTrainingCorpus.java → ...assification/test/TestTrainingCorpus.java b/...assification/test/TestTrainingCorpus.java → ...assification/test/TestTrainingCorpus.java
diff --git a/...sification/test/TestWeightingSchemes.java → ...sification/test/TestWeightingSchemes.java b/...sification/test/TestWeightingSchemes.java → ...sification/test/TestWeightingSchemes.java
diff --git a/...bble/classification/test/classifyDoc.java → ...bble/classification/test/classifyDoc.java b/...bble/classification/test/classifyDoc.java → ...bble/classification/test/classifyDoc.java