Update API

oeuvres · Aug 18, 2024 · a5d8507 · a5d8507
1 parent 6b2e049
commit a5d8507
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/com/github/oeuvres/alix/util/IntList.java b/src/main/java/com/github/oeuvres/alix/util/IntList.java
@@ -33,7 +33,9 @@
 package com.github.oeuvres.alix.util;
 
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Random;
+import java.util.Set;
 
 import com.github.oeuvres.alix.maths.Calcul;
 
@@ -339,11 +341,11 @@ public int[] toSet()
     {
         final int[] dst = new int[size];
         int dstPos = 0;
-        IntIntMap map = new IntIntMap(size);
+        Set<Integer> set = new HashSet<>(size);
         for (int srcPos = 0; srcPos < size; srcPos++) {
             final int value = data[srcPos];
-            if (map.contains(value)) continue;
-            map.put(value, 1);
+            if (set.contains(value)) continue;
+            set.add(value);
             dst[dstPos++] = value;
         }
         return Arrays.copyOf(dst, dstPos);

diff --git a/src/test/java/com/github/oeuvres/alix/util/EdgeMatrixTest.java b/src/test/java/com/github/oeuvres/alix/util/EdgeMatrixTest.java
@@ -2,6 +2,9 @@
 
 import static org.junit.Assert.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import org.junit.Test;
 
 public class EdgeMatrixTest
@@ -11,8 +14,10 @@ public class EdgeMatrixTest
     public void record()
     {
         int[] events = {1, 2, 3, 1, 2, 5, -4, 1, 2, 1, 3, 7, 8, 1, 3};
-        int[] nodes = new int[]{3,1};
-        EdgeMatrix matrix = new EdgeMatrix(nodes, false);
+        Map<Integer, Long> nodes = new HashMap<>();
+        nodes.put(3, 3L);
+        nodes.put(1, 5L);
+        EdgeMatrix matrix = new EdgeMatrix(nodes, 15, false);
         int previous = -1;
         for (int position = 0, max = events.length; position < max; position++) {
             final int nodeValue = events[position];

diff --git a/src/test/java/com/github/oeuvres/alix/util/EdgeRoller.java b/src/test/java/com/github/oeuvres/alix/util/EdgeRoller.java
@@ -88,7 +88,7 @@ public EdgeRoller(int[] words, final int distance) {
         this.freq = new long[words.length];
         this.uniqs = new boolean[words.length];
         this.distance = distance;
-        this.matrix = new EdgeMatrix(words, directed);
+        this.matrix = null;
     }
 
     /**