Use loop to replace alternate call.

cao-awa · Aug 27, 2024 · d2d4e93 · d2d4e93
1 parent f2cd6dd
commit d2d4e93
Show file tree

Hide file tree

Showing 7 changed files with 97 additions and 49 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style=official
-version_name=1.0.21
+version_name=1.0.22
 artifact_id=catheter
 group_id=com.github.cao.awa
diff --git a/src/main/java/com/github/cao/awa/catheter/BooleanCatheter.java b/src/main/java/com/github/cao/awa/catheter/BooleanCatheter.java
@@ -982,10 +982,14 @@ public BooleanCatheter flat(Function<Boolean, BooleanCatheter> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -1003,10 +1007,14 @@ public <X> Catheter<X> flatTo(Function<Boolean, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/ByteCatheter.java b/src/main/java/com/github/cao/awa/catheter/ByteCatheter.java
@@ -985,10 +985,14 @@ public ByteCatheter flat(Function<Byte, ByteCatheter> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -1006,10 +1010,14 @@ public <X> Catheter<X> flatTo(Function<Byte, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/Catheter.java b/src/main/java/com/github/cao/awa/catheter/Catheter.java
@@ -54,10 +54,14 @@ public Catheter<T> flat(Function<T, Catheter<T>> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -75,10 +79,14 @@ public <X> Catheter<X> flatTo(Function<T, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/DoubleCatheter.java b/src/main/java/com/github/cao/awa/catheter/DoubleCatheter.java
@@ -1006,10 +1006,14 @@ public DoubleCatheter flat(Function<Double, DoubleCatheter> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -1027,10 +1031,14 @@ public <X> Catheter<X> flatTo(Function<Double, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/IntCatheter.java b/src/main/java/com/github/cao/awa/catheter/IntCatheter.java
@@ -1006,10 +1006,14 @@ public IntCatheter flat(Function<Integer, IntCatheter> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -1027,10 +1031,14 @@ public <X> Catheter<X> flatTo(Function<Integer, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }

diff --git a/src/main/java/com/github/cao/awa/catheter/LongCatheter.java b/src/main/java/com/github/cao/awa/catheter/LongCatheter.java
@@ -1006,10 +1006,14 @@ public LongCatheter flat(Function<Long, LongCatheter> function) {
 
         this.targets = array(totalSize.get());
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                this.targets[i] = inner.fetch(i);
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return this;
     }
@@ -1027,10 +1031,14 @@ public <X> Catheter<X> flatTo(Function<Long, Catheter<X>> function) {
         Catheter<X> result = Catheter.makeCapacity(totalSize.get());
 
         catheter.alternate(0, (currentIndex, inner) -> {
-            return inner.alternate(currentIndex, (index, element) -> {
-                result.fetch(index, element);
-                return index + 1;
-            });
+            int i = currentIndex;
+            int innerSize = inner.count();
+            while (innerSize > 0){
+                result.fetch(i, inner.fetch(i));
+                i++;
+                innerSize--;
+            }
+            return currentIndex;
         });
         return result;
     }