fix tests

Author: tachyonicClock

.github/workflows/capymoa.yml

@@ -20,6 +20,10 @@ jobs:
         distribution: 'temurin'
         cache: maven
 
+    - name: Unit Tests
+      working-directory: ./moa
+      run: mvn -B test
+
     - name: Package Jar
       working-directory: ./moa
       # Package as JAR while skipping tests, javadoc, and latex build

moa/src/main/java/moa/clusterers/clustream/ClustreamKernel.java

@@ -46,12 +46,8 @@ public ClustreamKernel(Instance instance, int dimensions, long timestamp , doubl
 //        Avoid situations where the instance header hasn't been defined and runtime errors.
         if(instance.dataset() != null) {
             this.classObserver = new double[instance.numClasses()];
-//        instance.numAttributes() <= instance.classIndex() -> edge case where the class index is equal the
-//        number of attributes (i.e. there is no class value in the attributes array).
-            if (instance.numAttributes() > instance.classIndex() &&
-                    !instance.classIsMissing() &&
-                    instance.classValue() >= 0 &&
-                    instance.classValue() < instance.numClasses()) {
+//        
+            if (this.instanceHasClass(instance)) {
                 this.classObserver[(int) instance.classValue()]++;
             }
         }
@@ -72,12 +68,22 @@ public ClustreamKernel( ClustreamKernel cluster, double t, int m ) {
         this.classObserver = cluster.classObserver;
     }
 
+    private boolean instanceHasClass(Instance instance) {
+        // TODO: Why is this check necessary? Shouldn't classIsMissing() be enough?
+        // Edge case where the class index is out of bounds. number of attributes
+        // (i.e. there is no class value in the attributes array).
+        return instance.numAttributes() > instance.classIndex() &&
+                !instance.classIsMissing() && // Also check for missing class.
+                instance.classValue() >= 0 && // Or invalid class values.
+                instance.classValue() < instance.numClasses();
+    }
+
     public void insert( Instance instance, long timestamp ) {
         if(this.classObserver == null)
             this.classObserver = new double[instance.numClasses()];
-        if(!instance.classIsMissing() &&
-                instance.classValue() >= 0 &&
-                instance.classValue() < instance.numClasses()) {
+        System.out.println(instance.classIndex());
+
+        if(this.instanceHasClass(instance)) {
             this.classObserver[(int)instance.classValue()]++;
         }
         N++;

moa/src/test/java/moa/integration/SimpleClusterTest.java

@@ -22,26 +22,34 @@ public class SimpleClusterTest extends TestCase {
 	final static String [] Clusterers = new String[]{"ClusterGenerator", "CobWeb", "KMeans", 
 		"clustream.Clustream", "clustree.ClusTree", "denstream.WithDBSCAN -i 1000", "streamkm.StreamKM"};
 
-	@Test
-	public void testClusterGenerator(){testClusterer(Clusterers[0]);}
-//	@Test
-//	public void testCobWeb(){testClusterer(Clusterers[1]);}
-	@Test
-	public void testClustream(){testClusterer(Clusterers[3]);}
-	@Test
-	public void testClusTree(){testClusterer(Clusterers[4]);}
-	@Test
-	public void testDenStream(){testClusterer(Clusterers[5]);}
-	@Test
-	public void testStreamKM(){testClusterer(Clusterers[6]);}
+    @Test
+    public void testClusterGenerator() throws Exception {
+        testClusterer(Clusterers[0]);
+    }
+
+    @Test
+    public void testClustream() throws Exception {
+        testClusterer(Clusterers[3]);
+    }
+
+    @Test
+    public void testClusTree() throws Exception {
+        testClusterer(Clusterers[4]);
+    }
+
+    @Test
+    public void testDenStream() throws Exception {
+        testClusterer(Clusterers[5]);
+    }
+
+    @Test
+    public void testStreamKM() throws Exception {
+        testClusterer(Clusterers[6]);
+    }
 
-	void testClusterer(String clusterer) {
+	void testClusterer(String clusterer) throws Exception {
 		System.out.println("Processing: " + clusterer);
-		try {
-			doTask(new String[]{"EvaluateClustering -l " + clusterer});
-		} catch (Exception e) {
-			assertTrue("Failed on clusterer " + clusterer + ": " + e.getMessage(), false);
-		}
+        doTask(new String[]{"EvaluateClustering -l " + clusterer});
 	}
 
 	// code copied from moa.DoTask.main, to allow exceptions to be thrown in case of failure

moa/src/test/resources/moa/classifiers/trees/AdaHoeffdingOptionTree.ref

@@ -49,7 +49,7 @@ Index
   30000
 Votes
   0: 3.612203649887567E14
-  1: 1.24768970176524544E17
+  1: 1.2476897017652454E17
 Measurements
   classified instances: 29999
   classifications correct (percent): 85.57618587