ant

ckling · Aug 3, 2016 · 1d2e173 · 1d2e173
1 parent 57de85c
commit 1d2e173
Show file tree

Hide file tree

Showing 42 changed files with 13 additions and 35 deletions.
diff --git a/TopicModel.jar b/TopicModel.jar
diff --git a/bin/ckling/inference/PracticalInference.class b/bin/ckling/inference/PracticalInference.class
diff --git a/bin/ckling/inference/TopicModel$1.class b/bin/ckling/inference/TopicModel$1.class
diff --git a/bin/ckling/inference/TopicModel$2.class b/bin/ckling/inference/TopicModel$2.class
diff --git a/bin/ckling/inference/TopicModel$3.class b/bin/ckling/inference/TopicModel$3.class
diff --git a/bin/ckling/inference/TopicModel$4.class b/bin/ckling/inference/TopicModel$4.class
diff --git a/bin/ckling/inference/TopicModel.class b/bin/ckling/inference/TopicModel.class
diff --git a/bin/org/knowceans/corpus/Dictionary.class b/bin/org/knowceans/corpus/Dictionary.class
diff --git a/bin/org/knowceans/corpus/Document.class b/bin/org/knowceans/corpus/Document.class
diff --git a/bin/org/knowceans/corpus/ICorpus.class b/bin/org/knowceans/corpus/ICorpus.class
diff --git a/bin/org/knowceans/corpus/ILabelCorpus.class b/bin/org/knowceans/corpus/ILabelCorpus.class
diff --git a/bin/org/knowceans/corpus/ISplitCorpus.class b/bin/org/knowceans/corpus/ISplitCorpus.class
diff --git a/bin/org/knowceans/corpus/ITermCorpus.class b/bin/org/knowceans/corpus/ITermCorpus.class
diff --git a/bin/org/knowceans/util/ArmSampler$Envelope.class b/bin/org/knowceans/util/ArmSampler$Envelope.class
diff --git a/bin/org/knowceans/util/ArmSampler$Metropolis.class b/bin/org/knowceans/util/ArmSampler$Metropolis.class
diff --git a/bin/org/knowceans/util/ArmSampler$Point.class b/bin/org/knowceans/util/ArmSampler$Point.class
diff --git a/bin/org/knowceans/util/ArmSampler.class b/bin/org/knowceans/util/ArmSampler.class
diff --git a/bin/org/knowceans/util/ArrayIo.class b/bin/org/knowceans/util/ArrayIo.class
diff --git a/bin/org/knowceans/util/ArrayUtils.class b/bin/org/knowceans/util/ArrayUtils.class
diff --git a/bin/org/knowceans/util/CokusRandom.class b/bin/org/knowceans/util/CokusRandom.class
diff --git a/bin/org/knowceans/util/DirichletEstimation$GammaPolyaArms.class b/bin/org/knowceans/util/DirichletEstimation$GammaPolyaArms.class
diff --git a/bin/org/knowceans/util/DirichletEstimation$GammaPolyaParams.class b/bin/org/knowceans/util/DirichletEstimation$GammaPolyaParams.class
diff --git a/bin/org/knowceans/util/DirichletEstimation.class b/bin/org/knowceans/util/DirichletEstimation.class
diff --git a/bin/org/knowceans/util/DoubleFormat.class b/bin/org/knowceans/util/DoubleFormat.class
diff --git a/bin/org/knowceans/util/ExpDouble.class b/bin/org/knowceans/util/ExpDouble.class
diff --git a/bin/org/knowceans/util/Gamma.class b/bin/org/knowceans/util/Gamma.class
diff --git a/bin/org/knowceans/util/IndexQuickSort$1.class b/bin/org/knowceans/util/IndexQuickSort$1.class
diff --git a/bin/org/knowceans/util/IndexQuickSort$2.class b/bin/org/knowceans/util/IndexQuickSort$2.class
diff --git a/bin/org/knowceans/util/IndexQuickSort.class b/bin/org/knowceans/util/IndexQuickSort.class
diff --git a/bin/org/knowceans/util/MayaShades.class b/bin/org/knowceans/util/MayaShades.class
diff --git a/bin/org/knowceans/util/Pair.class b/bin/org/knowceans/util/Pair.class
diff --git a/bin/org/knowceans/util/ParallelFor$1.class b/bin/org/knowceans/util/ParallelFor$1.class
diff --git a/bin/org/knowceans/util/ParallelFor$Worker.class b/bin/org/knowceans/util/ParallelFor$Worker.class
diff --git a/bin/org/knowceans/util/ParallelFor.class b/bin/org/knowceans/util/ParallelFor.class
diff --git a/bin/org/knowceans/util/RandomSamplers$CrpData.class b/bin/org/knowceans/util/RandomSamplers$CrpData.class
diff --git a/bin/org/knowceans/util/RandomSamplers.class b/bin/org/knowceans/util/RandomSamplers.class
diff --git a/bin/org/knowceans/util/StopWatch.class b/bin/org/knowceans/util/StopWatch.class
diff --git a/bin/org/knowceans/util/Vectors.class b/bin/org/knowceans/util/Vectors.class
diff --git a/build.xml b/build.xml
@@ -34,19 +34,9 @@
         </javac>
     </target>
     <target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
-    <target name="Start">
-        <java classname="ckling.inference.Start" failonerror="true" fork="yes">
-            <classpath refid="hmdp.classpath"/>
-        </java>
-    </target>
-    <target name="TopicModel (1)">
+    <target name="HMDP">
         <java classname="ckling.inference.TopicModel" failonerror="true" fork="yes">
             <classpath refid="hmdp.classpath"/>
         </java>
     </target>
-    <target name="TransformData">
-        <java classname="ckling.tools.TransformData" failonerror="true" fork="yes">
-            <classpath refid="hmdp.classpath"/>
-        </java>
-    </target>
 </project>
diff --git a/src/ckling/inference/PracticalInference.java b/src/ckling/inference/PracticalInference.java
@@ -270,7 +270,7 @@ public class PracticalInference {
 
 	public static void main2 (String[] args) {
 
-		CopyOfPracticalInference pi = new CopyOfPracticalInference();
+		PracticalInference pi = new PracticalInference();
 
 
 
@@ -280,7 +280,7 @@ public static void main2 (String[] args) {
 		pi.readDict();		
 
 		System.out.println("Initialising parameters...");
-		pi.getParameters();
+		pi.initParameters();
 
 		System.out.println("Processing documents...");
 
@@ -336,7 +336,7 @@ public void initialise () {
 		System.out.println("Reading settings...");
 		readSettings();
 		readDict();		
-		getParameters();
+		initParameters();
 		System.out.println("Processing documents...");
 		readDocs();
 		System.out.println("Estimating topics...");
@@ -652,7 +652,7 @@ public void readGroups() {
 	}
 
 	//set Parameters
-	public void getParameters() {
+	public void initParameters() {
 		readFfromTextfile();
 		System.out.println("Reading groups...");
 
@@ -713,23 +713,12 @@ public void getParameters() {
 
 		for (int t=0; t < V; t++) {
 			for (int k=0;k<T;k++) {
-				//												//Random assignments of words to topics
-				//												double[] multrand = new double[T];
-				//												double rest = 1.0;
-				//												for (int k2=0;k2<T-1;k2++) {
-				//													double rand = Math.random();
-				//													multrand[k2]= rand * rest;
-				//													rest *= (1.0-rand);
-				//												}
-				//												multrand[T-1] = rest;
-				//												nkt[k][t] = wordfreq[t] * multrand[k];
 
 				nkt[k][t]= Math.random()*INIT_RAND;
-
-				//nkt[k][t] = (Double.valueOf(C)/V * 1.0/ Double.valueOf(T)) * 0.9 + 0.1 * (0.5-Math.random()) * C/Double.valueOf(T);
 				nk[k]+=nkt[k][t];
 
 				tempmkt[k][t] = 0.0;
+
 			}
 		}
 		pi_0 = new double[T];
@@ -766,7 +755,6 @@ public void getParameters() {
 		}
 
 
-		//sumqfgc = new double[F][];
 		sumqf = new double[F];
 
 		featureprior = new double[F];

diff --git a/src/ckling/inference/TopicModel.java b/src/ckling/inference/TopicModel.java
@@ -348,7 +348,7 @@ public static void food8ppx() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -435,7 +435,7 @@ public static void food8learnppx() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -629,7 +629,7 @@ public static void kappaporn() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -717,7 +717,7 @@ public static void burninfood() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -800,7 +800,7 @@ public static void burninporn() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -886,7 +886,7 @@ public static void ppxpornNolink(String ds, int K, int bs) {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 
@@ -965,7 +965,7 @@ public static void ppxporn3() {
 			pi.readDict();		
 
 			System.out.println("Initialising parameters...");
-			pi.getParameters();
+			pi.initParameters();
 
 			System.out.println("Processing documents...");
 

diff --git a/src/org/knowceans/util/RandomSamplers.java b/src/org/knowceans/util/RandomSamplers.java