Browse Source

cleanup: print/warnings

Ranides Atterwim 4 years ago
parent
commit
7722cbfa3a

+ 10 - 8
assira.core/src/main/java/net/ranides/assira/collection/maps/AOpenMap.java

@@ -530,14 +530,19 @@ public abstract class AOpenMap<K,V> extends AMap<K, V> implements BlockMap<K, V>
     
     private final class PEntry extends AEntry<K, V> {
 
-        private final int index;
-        private final K k;
+        private int index;
+        private K k;
         private V v;
 
         PEntry(int index) {
+            rebind(index);
+        }
+
+        public PEntry rebind(int index) {
             this.index = index;
             this.k = keys[index];
             this.v = values[index];
+            return this;
         }
 
         @Override
@@ -686,14 +691,11 @@ public abstract class AOpenMap<K,V> extends AMap<K, V> implements BlockMap<K, V>
 
     private final class FastEntryIterator extends MapIterator implements Iterator<Entry<K, V>> {
 
-        final BasicEntry<K, V> entry = new BasicEntry<>(null, null);
+        final PEntry entry = new PEntry(0);
 
         @Override
-        public BasicEntry<K, V> next() {
-            int index = nextEntry();
-            entry.key = keys[index];
-            entry.value = values[index];
-            return entry;
+        public Entry<K, V> next() {
+            return entry.rebind(nextEntry());
         }
     }
 

+ 1 - 0
assira.core/src/main/java/net/ranides/assira/collection/maps/Tag.java

@@ -185,6 +185,7 @@ public class Tag<K,V> implements Function<Map<K,? super V>,V> {
         return new DVEntry<>(type, key, map);
     }
 
+    @SuppressWarnings("unchecked")
     private static <T> T cast(IClass<T> type, Object value) {
         return type.isInstance(value) ? (T) value : null;
     }

+ 0 - 3
assira.core/src/main/java/net/ranides/assira/collection/query/support/BaseArrayParalell.java

@@ -44,7 +44,6 @@ public class BaseArrayParalell {
         int x = 0;
         for (int offset = begin, bound=end-blocksize; offset < bound; offset += blocksize) {
             int let_offset = offset;
-            System.out.printf(">>>>>    ARRAY TASK[%d]: %d-%d%n", ++x, let_offset, let_offset + blocksize);
             tasks.add(() -> {
                 loop(array, begin, let_offset, let_offset + blocksize, consumer);
                 return null;
@@ -53,13 +52,11 @@ public class BaseArrayParalell {
 
         int tail = length % threads;
         if (tail != 0) {
-            System.out.println(">>>>>    ARRAY TASK TAIL: " + (tail));
             tasks.add(() -> {
                 loop(array, begin, end - tail, end, consumer);
                 return null;
             });
         }
-        System.out.println(">>>>> ARRAY: " + tasks.size());
         ForkJoinPool.commonPool().invokeAll(tasks);
     }
 

+ 1 - 0
assira.core/src/main/java/net/ranides/assira/generic/TypeToken.java

@@ -87,6 +87,7 @@ public abstract class TypeToken<T> extends AClass<T> implements Serializable {
 		this.type = (IClass)type;
 	}
 
+    @SuppressWarnings("unchecked")
     public static <R> IClass<R> getParam(Object token) {
         // typeinfo(class).params[0]
         // wstawiło by nam do kontekstu parametr "T" pobrany z deklaracji TypeTokena

+ 2 - 0
assira.core/src/test/java/net/ranides/assira/collection/iterators/SpliteratorUtilsTest.java

@@ -1,5 +1,6 @@
 package net.ranides.assira.collection.iterators;
 
+import org.junit.Ignore;
 import org.junit.Test;
 
 import net.ranides.assira.collection.query.support.BaseSpliterator;
@@ -7,6 +8,7 @@ import net.ranides.assira.collection.query.support.BaseSpliterator;
 import java.util.Arrays;
 import java.util.List;
 
+@Ignore("manual")
 public class SpliteratorUtilsTest {
 
     @Test

+ 6 - 3
assira.core/src/test/java/net/ranides/assira/collection/lists/VirtualListBenchmark.java

@@ -12,8 +12,11 @@ import static org.junit.Assert.*;
 
 public class VirtualListBenchmark {
 
-    @Test
-    public void testSpliterator() {
+    public static void main(String[] args) {
+        testSpliterator();
+    }
+
+    private static void testSpliterator() {
         List<Integer> list = VirtualList.of(100, i -> i);
 
         AtomicInteger out1 = runStream(list.parallelStream());
@@ -23,7 +26,7 @@ public class VirtualListBenchmark {
         assertEquals(100, out2.get());
     }
 
-    private AtomicInteger runStream(Stream<Integer> stream) {
+    private static AtomicInteger runStream(Stream<Integer> stream) {
         TimeMetric tm = new TimeMetric();
         AtomicInteger out = new AtomicInteger(0);
         stream.forEach(v -> {

+ 5 - 6
assira.core/src/test/java/net/ranides/assira/collection/prototype/PrototypeMapTest.java

@@ -93,16 +93,15 @@ public class PrototypeMapTest {
 
     @Test
     public void entrySet_remove() {
-        System.out.println(map1.entrySet());
-//        System.out.println(map2.entrySet());
-
+        List<Map.Entry<Object, Object>> entries = new ArrayList<>(map1.entrySet());
 
         Iterator<Map.Entry<Object, Object>> a = map1.entrySet().iterator();
         a.next();
         a.remove();
 
-        System.out.println(map1.entrySet());
-        System.out.println(map1.size());
-//        System.out.println(map2.entrySet());
+        for (Map.Entry<Object, Object> entry : entries) {
+            assertNotNull(entry.getKey());
+            assertNotNull(entry.getValue());
+        }
     }
 }

+ 1 - 1
assira.core/src/test/java/net/ranides/assira/generic/NaturalComparatorTest.java

@@ -21,7 +21,7 @@ public class NaturalComparatorTest {
     public void separators() {
         String[] list = {"hello3.14", "hello4.0", "hello3.0.1"};
         Arrays.sort(list, NaturalComparator.comparator());
-        System.out.println(Arrays.toString(list));
+//        System.out.println(Arrays.toString(list));
         assertArrayEquals(new String[]{"hello3.0.1", "hello3.14", "hello4.0"}, list);
     }
 

+ 1 - 1
assira.core/src/test/java/net/ranides/assira/reflection/impl/AClassTest.java

@@ -211,7 +211,7 @@ public class AClassTest {
 //        System.out.println(listAt.returns().toString()); // sorry, we can't deduce interface arguments
         assertEquals("double", listAvg.returns().toString());
 
-        System.out.println();
+//        System.out.println();
     }
 
     @Test