Minor Fixes (#7)

* Minor Fixes

* one pass used card generator

* factor out lambdas

* Added to .gitignore

* Remove Herman

Author: AlexOxorn

.gitignore

@@ -6,7 +6,9 @@
 #JetBrains
 .idea/
 *.iml
+*.eml
 out/
+bin/
 
 #Java
 *.class

Output/Default Configuration 2021-8-25_20-17.results

@@ -1,5 +1,5 @@
 Note that precision falls off around the hundredth's place. Such is deemed acceptable given that only to about the tenth's place is required.
-Created by both Gabriel Toban Harris and Alexander Herman Oxorn. Most recent releases can be found at "https://github.com/Gabriel-T-Harris/Hand_Probability_Calculator".
+Created by both Gabriel Toban Harris and Alexander Oxorn. Most recent releases can be found at "https://github.com/Gabriel-T-Harris/Hand_Probability_Calculator".
 
 hand size: 5
 number of test hands: 1500000

structure/And_Operator_Node.java

@@ -5,7 +5,7 @@
 /**
 <b>
 Purpose: And operator<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */
 

structure/Deck_Card.java

@@ -7,7 +7,7 @@
 /**
 <b>
 Purpose: To be used as the representation of cards in a deck.<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */
 

structure/Evaluable.java

@@ -4,14 +4,17 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Queue;
+import java.util.StringJoiner;
+import java.util.Arrays;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
 <b>
 Purpose: Requirement to be a node for evaluation purposes.<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */
 
@@ -59,7 +62,7 @@ interface RollbackCallback {
 
     /**
      * Constructor to force unified id among all subclasses.
-     * 
+     *
      * @param NAME {@link #NAME}
      */
     public Evaluable(final String NAME)
@@ -70,9 +73,9 @@ public Evaluable(final String NAME)
 
     /**
      * Output whole tree in dot file format.
-     * 
+     *
      * @param START of breath first search
-     * 
+     *
      * @return representation of whole structure in dot file format
      */
     public static String print_whole_subtree(final Evaluable START)
@@ -102,11 +105,11 @@ public static String print_whole_subtree(final Evaluable START)
 
     /**
      * Allows for hand to be in an arbitrary order. Default entry point where the success callback returns true and the failure callback returns false
-     * 
+     *
      * @param <E> anything that is {@link Reservable} will do
      *
      * @param hand to be checked {@link Collection}
-     * 
+     *
      * @return If the hand meets a condition
      */
     public <E extends Reservable> boolean evaluate(final Collection<E> hand)
@@ -139,6 +142,51 @@ protected Collection<? extends Evaluable> continue_breath_search()
         throw new UnsupportedOperationException("Child failed to override me.");
     }
 
+
+    /**
+     * @return a {@link List} of two {@link StringJoiner}s with ", " delimiter and [ ] prefix and suffix
+     */
+    private static List<StringJoiner> StringJoinerListGenerator() {
+        return Arrays.asList(
+                new StringJoiner(", ", "[", "]"),
+                new StringJoiner(", ", "[", "]")
+        );
+    }
+
+    /**
+     * Takes a {@link Reservable} and adds it to the first {@link StringJoiner} if its reserved and the second
+     * otherwise
+     *
+     * @param partialSum the current state of the two StringJoiners
+     * @param nextElement the next Reservable to add to the StringJoiner
+     */
+    private static void StringJoinerListPartialAdder(List<StringJoiner> partialSum, Reservable nextElement) {
+        partialSum.get(nextElement.isReserved() ? 0 : 1).add(nextElement.toString());
+    }
+
+    /**
+     * Takes two {@link List}s of {@link StringJoiner}s and merges them together index wise
+     *
+     * @param partialSum1 List of StringJoiner to be merged to
+     * @param partialSum2 List of StringJoiner to be merged with
+     * @return partialSum1 after having their elements be merged with partialSum2's
+     */
+    private static List<StringJoiner> StringJoinerListJoiner(List<StringJoiner> partialSum1, List<StringJoiner> partialSum2) {
+        partialSum1.get(0).merge(partialSum2.get(0));
+        partialSum1.get(1).merge(partialSum2.get(1));
+        return partialSum1;
+    }
+
+    /**
+     * Takes a {@link List} of {@link StringJoiner}s returns a {@link List} of their final {@link String}
+     *
+     * @param finalSum StringJoiner after all of the elements have been added
+     * @return The {@link String} representing the joined elements
+     */
+    private static List<String> StringJoinerToStringList(List<StringJoiner> finalSum) {
+        return finalSum.stream().map(StringJoiner::toString).collect(Collectors.toList());
+    }
+
     /**
      * If debugMode is set, print current debug details about the currently executing node
      *
@@ -147,10 +195,15 @@ protected Collection<? extends Evaluable> continue_breath_search()
     <E extends Reservable> void printDebugStep(final Collection<E> hand)
     {
         if (debugMode) {
-            System.out.printf("%s ", this);
-            Map<Boolean, List<E>> hand_partition = hand.stream().collect(Collectors.partitioningBy(Reservable::isReserved));
-            System.out.printf("Used Cards: [%s] ", hand_partition.get(true).stream().map(Object::toString).collect(Collectors.joining(",")));
-            System.out.printf("Unused Cards: [%s]\n", hand_partition.get(false).stream().map(Object::toString).collect(Collectors.joining(",")));
+            System.out.print(this + " ");
+            List<String> usedAndUnusedCards = hand.stream().collect(Collector.of(
+                    Evaluable::StringJoinerListGenerator,
+                    Evaluable::StringJoinerListPartialAdder,
+                    Evaluable::StringJoinerListJoiner,
+                    Evaluable::StringJoinerToStringList
+            ));
+            System.out.printf("Used Cards: %s ", usedAndUnusedCards.get(0));
+            System.out.printf("Unused Cards: %s\n", usedAndUnusedCards.get(1));
         }
     }
 }

structure/Leaf_Node.java

@@ -5,7 +5,7 @@
 /**
 <b>
 Purpose: Also will be used as the leaf node of the tree structure.<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 
 * @param <T> is the type of card to hold, suggestion of {@link Base_Card}.
@@ -55,7 +55,7 @@ public <E extends Reservable> TestResult evaluate(Collection<E> hand, RollbackCa
                     }
                     card.release();
                 }
-                if (result == TestResult.Success || result == TestResult.NotSuccess) {
+                if (result == TestResult.NotSuccess || result == TestResult.Success) {
                     return result;
                 }
             }

structure/Not_Operator_Node.java

@@ -1,12 +1,12 @@
 package structure;
 
-import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 /**
 <b>
 Purpose: Not Operator<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */
 
@@ -19,7 +19,7 @@ public class Not_Operator_Node extends Base_Node
 
     /**
      * Constructor. Meaning of operator is the lack of something. Thus looking for NOT A would only be true if A was not unreserved in remaining hand.
-     * 
+     *
      * @param CHILD to be negated.
      */
     public Not_Operator_Node(final Evaluable CHILD)
@@ -50,6 +50,6 @@ public String toString()
     @Override
     protected Collection<? extends Evaluable> continue_breath_search()
     {
-        return Arrays.asList(this.CHILD);
+        return Collections.singletonList(this.CHILD);
     }
 }

structure/Or_Operator_Node.java

@@ -5,7 +5,7 @@
 /**
 <b>
 Purpose: Or operator<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */
 

structure/Reservable.java

@@ -3,7 +3,7 @@
 /**
 <b>
 Purpose: Requirement to be a node for evaluation purposes.<br>
-Programmer: Alexander Herman Oxorn, Gabriel Toban Harris <br>
+Programmer: Alexander Oxorn, Gabriel Toban Harris <br>
 Date: 2021-07-29/2021-8-17/2021-8-21
 </b>
 */

structure/Scenario.java

@@ -5,7 +5,7 @@
 /**
 <b>
 Purpose: Contain entire tree structure of {@link Base_Node} in a named reusable manner.<br>
-Programmer: Gabriel Toban Harris, Alexander Herman Oxorn
+Programmer: Gabriel Toban Harris, Alexander Oxorn
 </b>
 */