Revert commits which were accidently merged.

Author: Gabriel-T-Harris

Notes.txt

@@ -4,7 +4,7 @@ Configuration File:
     -throw away none main deck parts
 -maybe read a ydk file instead of in same file.
 -declare scenarios
--state which to display at the end, which also states which should be evaluated on its on
+-state which to display at the end
 
 Structure:
 
@@ -14,21 +14,20 @@ Structure:
 -short circuit operator evaluation
 -node per operator
 -node per single match as leaf
--cards are used, thereby preventing a card from being matched by multiple conditions.
+-TODO: figure out duplicates and overlap of sub-scenarios.
 
 Parser:
 
--Like a compiler going over expressions (context free grammar).
--Table driven, LL(1)
+-Like a compiler going over expressions.
+-Table driven?
 
 Later Versions:
 
 -add special ability to cards
     -example, when a hand includes a draw card, apply draw to look at more cards for evaluations
-    -draw, example Pot of Greed
-    -excavate, Pot of Duality
-    -draw then discard, Graceful Charity
-    -other such as Pot of Desires
 
 -provide more options for writing configuration file?
     -allow some regex for stating cards?
+
+-additional options for command line arguments?
+    -maybe put in the planned (yet to be written) command line argument parser

parser/Grammar notes.txt

@@ -1,58 +1,63 @@
 Configuration file grammar:
 //regex which replace literal values used are represented by the following:
 deck_list: deck list:
+card_name: [^;\]]+ //include CONDITION_CARD_END
 scenarios: scenarios:
+scenario_name: [^=>]+ //include CONDITION_SCENARIO_END
 display: display
 Upper case: not, and, or, xor
 Lower case: true, false
 single symbol are exactly the same.
-id: "[^;=\n" + SENTINEL_START + SENTINEL_END + CONDITION_CARD_START + CONDITION_CARD_END +
-    CONDITION_SCENARIO_START + CONDITION_SCENARIO_END + CONDITION_EXPR_START + CONDITION_EXPR_END + "]+"
+
+Merge card_name and scenario_name and not allowing any already reserved special characters into unified ID regex for tokenizer.
+Thus ID: [^;=<>\(\)\{\}]+ and grammar will defer to ID in places it used to use them.
 
 //lower case for literal, capital for production rule.
+//Note grammar does not have the unification resulting in ID, though is coded with that change.
 START -> DECK PROBABILITY .
 
 DECK -> DECK_START SENTINEL_START DECK_LIST SENTINEL_END.
 DECK_START -> deck list: .
 DECK_LIST -> CARD MORE_CARDS .
 MORE_CARDS -> CARD MORE_CARDS | .
 CARD -> CARD_NAME ; .
-CARD_NAME -> id .
+CARD_NAME -> card_name .
 
 PROBABILITY -> PROBABILITY_START SENTINEL_START SCENARIO_LIST SENTINEL_END .
 PROBABILITY_START -> scenarios: .
 
 SCENARIO_LIST -> SCENARIO MORE_SCENARIOS .
 MORE_SCENARIOS -> SCENARIO MORE_SCENARIOS | .
 
-SCENARIO -> SCENARIO_NAME assign SENTINEL_START TREE DISPLAY SENTINEL_END .
-SCENARIO_NAME -> id .
+SCENARIO -> SCENARIO_NAME = SENTINEL_START TREE DISPLAY SENTINEL_END .
+SCENARIO_NAME -> scenario_name .
 
-TREE -> TREE_START assign SENTINEL_START EXPR SENTINEL_END ; .
+TREE -> TREE_START = SENTINEL_START EXPR SENTINEL_END ; .
 TREE_START -> scenario .
 
 EXPR -> UNARY_EXPR BINARY_EXPR .
 
 UNARY_EXPR -> UNARY_OPERATOR UNARY_EXPR | PRIMARY_EXPR .
 UNARY_OPERATOR -> not .
 
-PRIMARY_EXPR -> CONDITION_CARD_START CARD_NAME CONDITION_CARD_END | CONDITION_SCENARIO_START SCENARIO_NAME CONDITION_SCENARIO_END | CONDITION_EXPR_START EXPR CONDITION_EXPR_END .
-
-CONDITION_CARD_START -> open_bracket .
-CONDITION_CARD_END -> close_bracket .
-CONDITION_SCENARIO_START -> less_then .
-CONDITION_SCENARIO_END -> greater_then .
-CONDITION_EXPR_START -> open_parenthesis .
-CONDITION_EXPR_END -> close_parenthesis .
+PRIMARY_EXPR -> CONDITION_CARD_START CARD_NAME CONDITION_CARD_END 
+               |CONDITION_SCENARIO_START SCENARIO_NAME CONDITION_SCENARIO_END 
+               |CONDITION_EXPR_START EXPR CONDITION_EXPR_END .
+CONDITION_CARD_START -> [ .
+CONDITION_CARD_END -> ] .
+CONDITION_SCENARIO_START -> < .
+CONDITION_SCENARIO_END -> > .
+CONDITION_EXPR_START -> ( .
+CONDITION_EXPR_END -> ) .
 
 BINARY_EXPR -> BINARY_OPERATOR UNARY_EXPR BINARY_EXPR | .
 BINARY_OPERATOR -> and | or | xor .
 
-DISPLAY -> DISPLAY_START assign DISPLAY_VALUE ; | .
+DISPLAY -> DISPLAY_START = DISPLAY_VALUE ; | .
 DISPLAY_START -> display .
 DISPLAY_VALUE -> true | false .
 
-SENTINEL_START -> open_brace .
-SENTINEL_END -> close_brace .
+SENTINEL_START -> { .
+SENTINEL_END -> } .
 
-https://smlweb.cpsc.ucalgary.ca/vital-stats.php?grammar=START+-%3E+DECK+PROBABILITY+.%0D%0A%0D%0ADECK+-%3E+DECK_START+SENTINEL_START+DECK_LIST+SENTINEL_END.%0D%0ADECK_START+-%3E+deck+list%3A+.%0D%0ADECK_LIST+-%3E+CARD+MORE_CARDS+.%0D%0AMORE_CARDS+-%3E+CARD+MORE_CARDS+%7C+.%0D%0ACARD+-%3E+CARD_NAME+%3B+.%0D%0ACARD_NAME+-%3E+id+.%0D%0A%0D%0APROBABILITY+-%3E+PROBABILITY_START+SENTINEL_START+SCENARIO_LIST+SENTINEL_END+.%0D%0APROBABILITY_START+-%3E+scenarios%3A+.%0D%0A%0D%0ASCENARIO_LIST+-%3E+SCENARIO+MORE_SCENARIOS+.%0D%0AMORE_SCENARIOS+-%3E+SCENARIO+MORE_SCENARIOS+%7C+.%0D%0A%0D%0ASCENARIO+-%3E+SCENARIO_NAME+assign+SENTINEL_START+TREE+DISPLAY+SENTINEL_END+.%0D%0ASCENARIO_NAME+-%3E+id+.%0D%0A%0D%0ATREE+-%3E+TREE_START+assign+SENTINEL_START+EXPR+SENTINEL_END+%3B+.%0D%0ATREE_START+-%3E+scenario+.%0D%0A%0D%0AEXPR+-%3E+UNARY_EXPR+BINARY_EXPR+.%0D%0A%0D%0AUNARY_EXPR+-%3E+UNARY_OPERATOR+UNARY_EXPR+%7C+PRIMARY_EXPR+.%0D%0AUNARY_OPERATOR+-%3E+not+.%0D%0A%0D%0APRIMARY_EXPR+-%3E+CONDITION_CARD_START+CARD_NAME+CONDITION_CARD_END+%7C+CONDITION_SCENARIO_START+SCENARIO_NAME+CONDITION_SCENARIO_END+%7C+CONDITION_EXPR_START+EXPR+CONDITION_EXPR_END+.%0D%0A%0D%0ACONDITION_CARD_START+-%3E+open_bracket+.%0D%0ACONDITION_CARD_END+-%3E+close_bracket+.%0D%0ACONDITION_SCENARIO_START+-%3E+less_then+.%0D%0ACONDITION_SCENARIO_END+-%3E+greater_then+.%0D%0ACONDITION_EXPR_START+-%3E+open_parenthesis+.%0D%0ACONDITION_EXPR_END+-%3E+close_parenthesis+.%0D%0A%0D%0ABINARY_EXPR+-%3E+BINARY_OPERATOR+UNARY_EXPR+BINARY_EXPR+%7C+.%0D%0ABINARY_OPERATOR+-%3E+and+%7C+or+%7C+xor+.%0D%0A%0D%0ADISPLAY+-%3E+DISPLAY_START+assign+DISPLAY_VALUE+%3B+%7C+.%0D%0ADISPLAY_START+-%3E+display+.%0D%0ADISPLAY_VALUE+-%3E+true+%7C+false+.%0D%0A%0D%0ASENTINEL_START+-%3E+open_brace+.%0D%0ASENTINEL_END+-%3E+close_brace+.
+https://smlweb.cpsc.ucalgary.ca/vital-stats.php?grammar=START+-%3E+DECK+PROBABILITY+.%0D%0A%0D%0ADECK+-%3E+DECK_START+SENTINEL_START+DECK_LIST+SENTINEL_END.%0D%0ADECK_START+-%3E+deck_list%3A+.%0D%0ADECK_LIST+-%3E+CARD+MORE_CARDS+.%0D%0AMORE_CARDS+-%3E+CARD+MORE_CARDS+%7C+.%0D%0ACARD+-%3E+CARD_NAME+%3B+.%0D%0ACARD_NAME+-%3E+card_name+.%0D%0A%0D%0APROBABILITY+-%3E+PROBABILITY_START+SENTINEL_START+SCENARIO_LIST+SENTINEL_END+.%0D%0APROBABILITY_START+-%3E+scenarios%3A+.%0D%0A%0D%0ASCENARIO_LIST+-%3E+SCENARIO+MORE_SCENARIOS+.%0D%0AMORE_SCENARIOS+-%3E+SCENARIO+MORE_SCENARIOS+%7C+.%0D%0A%0D%0ASCENARIO+-%3E+SCENARIO_NAME+equals+SENTINEL_START+TREE+DISPLAY+SENTINEL_END+.%0D%0ASCENARIO_NAME+-%3E+scenario_name+.%0D%0A%0D%0ATREE+-%3E+TREE_START+SENTINEL_START+EXPR+SENTINEL_END+%3B+.%0D%0ATREE_START+-%3E+scenario+equals+.%0D%0A%0D%0AEXPR+-%3E+UNARY_EXPR+BINARY_EXPR+.%0D%0A%0D%0AUNARY_EXPR+-%3E+UNARY_OPERATOR+UNARY_EXPR+%7C+PRIMARY_EXPR+.%0D%0AUNARY_OPERATOR+-%3E+not+.%0D%0A%0D%0APRIMARY_EXPR+-%3E+CONDITION_CARD_START+CARD_NAME+CONDITION_CARD_END+%0D%0A+++++++++++++++%7CCONDITION_SCENARIO_START+SCENARIO_NAME+CONDITION_SCENARIO_END+%0D%0A+++++++++++++++%7CCONDITION_EXPR_START+EXPR+CONDITION_EXPR_END+.%0D%0ACONDITION_CARD_START+-%3E+open_bracket+.%0D%0ACONDITION_CARD_END+-%3E+close_bracket+.%0D%0ACONDITION_SCENARIO_START+-%3E+less_than+.%0D%0ACONDITION_SCENARIO_END+-%3E+greater_than+.%0D%0ACONDITION_EXPR_START+-%3E+open_parenthesis+.%0D%0ACONDITION_EXPR_END+-%3E+close_parenthesis+.%0D%0A%0D%0ABINARY_EXPR+-%3E+BINARY_OPERATOR+UNARY_EXPR+BINARY_EXPR+%7C+.%0D%0ABINARY_OPERATOR+-%3E+and+%7C+or+%7C+xor+.%0D%0A%0D%0ADISPLAY+-%3E+DISPLAY_START+DISPLAY_VALUE+%3B+%7C+.%0D%0ADISPLAY_START+-%3E+display+equals+.%0D%0ADISPLAY_VALUE+-%3E+true+%7C+false+.%0D%0A%0D%0ASENTINEL_START+-%3E+open_brace.%0D%0ASENTINEL_END+-%3E+close_brace+.

structure/And_Operator_Node.java

@@ -6,6 +6,7 @@
 <b>
 Purpose: And operator<br>
 Programmer: Gabriel Toban Harris, Alexander Herman Oxorn <br>
+Date: 2021-07-24
 </b>
 */
 

structure/Base_Node.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package structure;
 
 import java.util.Collection;
@@ -40,3 +41,44 @@ protected Collection<? extends Evaluable<T>> continue_breath_search()
         return null;
     }
 }
+=======
+package structure;
+
+/**
+<b>
+Purpose: To be the base node which others will extend.<br>
+Programmer: Gabriel Toban Harris <br>
+Date: 2021-07-23
+</b>
+*/
+
+//TODO: add toString() methods with some reference to outputting as dot file format.
+//TODO: figure out edge cases in evaluation for both duplication (maybe paint) and overlap (maybe attempt condition evaluation in different combinations).
+public abstract class Base_Node<T> implements Evaluable<T>
+{
+    /**
+     * Unique identifier for this node.
+     */
+    public final int UNIQUE_IDENTIFIER;
+
+    /**
+     * The name of this node.
+     */
+    public final String NAME;
+
+    /**
+     * Used to set {@link #UNIQUE_IDENTIFIER}
+     */
+    private static int CREATED_NODES_COUNT = 0;
+
+    /**
+     * Constructor of {@link #Base_Node}.
+     * @param NAME the name to be given to this {@link #Base_Node}
+     */
+    public Base_Node(final String NAME)
+    {
+        this.NAME = NAME;
+        this.UNIQUE_IDENTIFIER = ++CREATED_NODES_COUNT;
+    }
+}
+>>>>>>> parent of 3a3d00d... Clean Up

structure/Binary_Operator_Node.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package structure;
 
 import java.util.Collection;
@@ -52,3 +53,42 @@ protected Collection<? extends Evaluable<T>> continue_breath_search()
         return List.of(this.LEFT_CHILD, this.RIGHT_CHILD);
     }
 }
+=======
+package structure;
+
+/**
+<b>
+Purpose: Base of the binary operators.<br>
+Programmer: Gabriel Toban Harris <br>
+Date: 2021-07-24
+</b>
+*/
+
+//TODO: consider converting to at least 2
+public abstract class Binary_Operator_Node<T> extends Base_Node<T>
+{
+    /**
+     * Left operand.
+     */
+    public final Evaluable<T> LEFT_CHILD;
+
+    /**
+     * Right operand.
+     */
+    public final Evaluable<T> RIGHT_CHILD;
+
+    /**
+     * Constructor.
+     * 
+     * @param NAME of the node
+     * @param LEFT_CHILD is the left operand of the operator
+     * @param RIGHT_CHILD is the right operand of the operator
+     */
+    public Binary_Operator_Node(String NAME, final Evaluable<T> LEFT_CHILD, final Evaluable<T> RIGHT_CHILD)
+    {
+        super(NAME);
+        this.LEFT_CHILD = LEFT_CHILD;
+        this.RIGHT_CHILD = RIGHT_CHILD;
+    }
+}
+>>>>>>> parent of 3a3d00d... Clean Up

structure/Deck_Card.java

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

structure/Evaluable.java

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

structure/Leaf_Node.java

@@ -6,6 +6,7 @@
 <b>
 Purpose: Also will be used as the leaf node of the tree structure.<br>
 Programmer: Gabriel Toban Harris, Alexander Herman Oxorn <br>
+Date: 2021-07-23
 </b>
 */
 

structure/Not_Operator_Node.java

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package structure;
 
 import java.util.ArrayList;
@@ -49,3 +50,41 @@ protected Collection<? extends Evaluable<T>> continue_breath_search()
         return List.of(this.CHILD);
     }
 }
+=======
+package structure;
+
+import java.util.Collection;
+
+/**
+<b>
+Purpose: Not Operator<br>
+Programmer: Gabriel Toban Harris, Alexander Herman Oxorn <br>
+Date: 2021-07-24
+</b>
+*/
+
+public class Not_Operator_Node<T> extends Base_Node<T>
+{
+    /**
+     * Child which is negated.
+     */
+    public final Evaluable<T> CHILD;
+
+    public Not_Operator_Node(final Evaluable<T> CHILD)
+    {
+        super("NOT");
+        this.CHILD = CHILD;
+    }
+
+    @Override
+    public <E extends Reservable> TestResult evaluate(Collection<E> hand, RollbackCallback next) {
+        printDebugStep(hand);
+        TestResult result = CHILD.evaluate(hand, () -> TestResult.NotSuccess);
+        if (result == TestResult.NotSuccess) {
+            return TestResult.Rollback;
+        }
+        // result should only ever be TestResult.Rollback here
+        return next.call();
+    }
+}
+>>>>>>> parent of 3a3d00d... Clean Up

structure/Or_Operator_Node.java

@@ -6,6 +6,7 @@
 <b>
 Purpose: Or operator<br>
 Programmer: Gabriel Toban Harris, Alexander Herman Oxorn <br>
+Date: 2021-07-24
 </b>
 */