From 20395941dcfc96faa6463f089b3110fa1a7925e3 Mon Sep 17 00:00:00 2001
From: s460941 <ivanov@st.amu.edu.pl>
Date: Wed, 10 Jun 2020 12:49:48 +0200
Subject: [PATCH] v2

---
 .idea/workspace.xml | 33 ++++++++-------
 worker.fcl          | 98 ++++++++++++++++++---------------------------
 2 files changed, 55 insertions(+), 76 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fcab1f8..dbc5877 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="0fc070d1-3753-43f5-b5e7-37c2bc110b95" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/worker.fcl" beforeDir="false" afterPath="$PROJECT_DIR$/worker.fcl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -90,38 +89,38 @@
       <screen x="67" y="27" width="1533" height="873" />
     </state>
     <state x="291" y="120" key="#com.intellij.execution.impl.EditConfigurationsDialog/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591713379914" />
-    <state width="1510" height="246" key="GridCell.Tab.0.bottom" timestamp="1591781314920">
+    <state width="1510" height="246" key="GridCell.Tab.0.bottom" timestamp="1591785983186">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="246" key="GridCell.Tab.0.bottom/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591781314920" />
-    <state width="1510" height="246" key="GridCell.Tab.0.center" timestamp="1591781314920">
+    <state width="1510" height="246" key="GridCell.Tab.0.bottom/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785983186" />
+    <state width="1510" height="246" key="GridCell.Tab.0.center" timestamp="1591785983186">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="246" key="GridCell.Tab.0.center/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591781314920" />
-    <state width="1510" height="246" key="GridCell.Tab.0.left" timestamp="1591781314920">
+    <state width="1510" height="246" key="GridCell.Tab.0.center/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785983186" />
+    <state width="1510" height="246" key="GridCell.Tab.0.left" timestamp="1591785983186">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="246" key="GridCell.Tab.0.left/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591781314920" />
-    <state width="1510" height="246" key="GridCell.Tab.0.right" timestamp="1591781314920">
+    <state width="1510" height="246" key="GridCell.Tab.0.left/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785983186" />
+    <state width="1510" height="246" key="GridCell.Tab.0.right" timestamp="1591785983186">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="246" key="GridCell.Tab.0.right/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591781314920" />
-    <state width="1510" height="272" key="GridCell.Tab.1.bottom" timestamp="1591725393594">
+    <state width="1510" height="246" key="GridCell.Tab.0.right/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785983186" />
+    <state width="1510" height="272" key="GridCell.Tab.1.bottom" timestamp="1591785311471">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="272" key="GridCell.Tab.1.bottom/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591725393594" />
-    <state width="1510" height="272" key="GridCell.Tab.1.center" timestamp="1591725393594">
+    <state width="1510" height="272" key="GridCell.Tab.1.bottom/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785311471" />
+    <state width="1510" height="272" key="GridCell.Tab.1.center" timestamp="1591785311468">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="272" key="GridCell.Tab.1.center/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591725393594" />
-    <state width="1510" height="272" key="GridCell.Tab.1.left" timestamp="1591725393594">
+    <state width="1510" height="272" key="GridCell.Tab.1.center/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785311468" />
+    <state width="1510" height="272" key="GridCell.Tab.1.left" timestamp="1591785311468">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="272" key="GridCell.Tab.1.left/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591725393594" />
-    <state width="1510" height="272" key="GridCell.Tab.1.right" timestamp="1591725393594">
+    <state width="1510" height="272" key="GridCell.Tab.1.left/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785311468" />
+    <state width="1510" height="272" key="GridCell.Tab.1.right" timestamp="1591785311471">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
-    <state width="1510" height="272" key="GridCell.Tab.1.right/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591725393594" />
+    <state width="1510" height="272" key="GridCell.Tab.1.right/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591785311471" />
     <state x="376" y="181" width="904" height="562" key="com.intellij.xdebugger.impl.breakpoints.ui.BreakpointsDialogFactory$2" timestamp="1591723368763">
       <screen x="67" y="27" width="1533" height="873" />
     </state>
diff --git a/worker.fcl b/worker.fcl
index e758a49..bd39051 100644
--- a/worker.fcl
+++ b/worker.fcl
@@ -12,20 +12,16 @@ END_VAR
 
 FUZZIFY form1
  RANGE := (-1.000 .. 5.000);
- TERM bad := (0.5,1)(1.5,0);
- TERM notbad := (0.5,0)(1.5,1)(2.5,0)
- TERM avg := (1.5,0)(2.5,1)(3.5,0)
- TERM notgreat := (2.5,0)(3.5,1)(4.5,0)
- TERM great := (3.5,0)(4.5,1);
+ TERM bad := (1,1)(2,0);
+ TERM avg := (1,0)(2,1)(3,1)(4,0);
+ TERM great := (3,0)(4,1);
 END_FUZZIFY
 
 FUZZIFY form2
  RANGE := (-1.000 .. 5.000);
- TERM bad := (0.5,1)(1.5,0);
- TERM notbad := (0.5,0)(1.5,1)(2.5,0)
- TERM avg := (1.5,0)(2.5,1)(3.5,0)
- TERM notgreat := (2.5,0)(3.5,1)(4.5,0)
- TERM great := (3.5,0)(4.5,1);
+ TERM bad := (1,1)(2,0);
+ TERM avg := (1,0)(2,1)(3,1)(4,0);
+ TERM great := (3,0)(4,1);
 END_FUZZIFY
 
 FUZZIFY points
@@ -50,59 +46,43 @@ RULEBLOCK
  ACCU : MAX;
  ACT : MIN;
 
- // form1: great | form2
+ // aktualny wynik 0.364734
+
+ //tego nic nie daje
  RULE 0 : if form1 is great and form2 is bad then result is home
- RULE 1 : if form1 is great and form2 is notbad then result is home
- RULE 2 : if form1 is great and form2 is avg then result is home
- RULE 3 : if form1 is great and form2 is notgreat then result is home
-    //rozbicie jednego draw
-    RULE 4 : if form1 is great and form2 is great and points is low then result is away
-    RULE 5 : if form1 is great and form2 is great and points is avg then result is draw
-    RULE 6 : if form1 is great and form2 is great and points is high then result is home
-
- // form1: notgreat | form2
- RULE 7 : if form1 is notgreat and form2 is bad then result is home
- RULE 8 : if form1 is notgreat and form2 is notbad then result is home
-    // rozbicie
-    RULE 9 : if form1 is notgreat and form2 is avg and points is low then result is away
-    RULE 10 : if form1 is notgreat and form2 is avg and points is avg then result is draw
-    RULE 11 : if form1 is notgreat and form2 is avg and points is high then result is home
-    // rozbicie
-    RULE 12 : if form1 is notgreat and form2 is notgreat and points is low then result is away
-    RULE 13 : if form1 is notgreat and form2 is notgreat and points is avg then result is draw
-    RULE 14 : if form1 is notgreat and form2 is notgreat and points is high then result is home
- RULE 15 : if form1 is notgreat and form2 is great then result is away
-
- // form1: avg | form2
- RULE 16 : if form1 is avg and form2 is bad then result is home
- RULE 17 : if form1 is avg and form2 is notbad then result is home
-    // rozbicie
-    RULE 18 : if form1 is avg and form2 is avg and points is low then result is away
-    RULE 19 : if form1 is avg and form2 is avg and points is avg then result is draw
-    RULE 20 : if form1 is avg and form2 is avg and points is high then result is home
- RULE 21 : if form1 is avg and form2 is notgreat then result is away
- RULE 22 : if form1 is avg and form2 is great then result is away
-
-
- // form1: notbad | form2
- RULE 23 : if form1 is notbad and form2 is bad then result is home
+ // rozbicie home
+ RULE 3 : if form1 is great and form2 is avg and points is low then result is draw
+ RULE 4 : if form1 is great and form2 is avg and points is avg then result is home
+ RULE 5 : if form1 is great and form2 is avg and points is high then result is home
     //rozbicie
-    RULE 24 : if form1 is notbad and form2 is notbad and points is low then result is away
-    RULE 25 : if form1 is notbad and form2 is notbad and points is avg then result is draw
-    RULE 26 : if form1 is notbad and form2 is notbad and points is high then result is home
- RULE 27 : if form1 is notbad and form2 is avg then result is away
- RULE 28 : if form1 is notbad and form2 is notgreat then result is away
- RULE 29 : if form1 is notbad and form2 is great then result is away
+    RULE 6 : if form1 is great and form2 is great and points is low then result is away
+    RULE 7 : if form1 is great and form2 is great and points is avg then result is draw
+    RULE 8 : if form1 is great and form2 is great and points is high then result is home
 
-  // form1: bad | form2
+ //rozbicie tego jednego home coś dało
+ RULE 31 : if form1 is avg and form2 is bad and points is low then result is away
+ RULE 32 : if form1 is avg and form2 is bad and points is avg then result is draw
+ RULE 33 : if form1 is avg and form2 is bad and points is high then result is home
     //rozbicie
-    RULE 30 : if form1 is bad and form2 is bad and points is low then result is away
-    RULE 31 : if form1 is bad and form2 is bad and points is avg then result is draw
-    RULE 32 : if form1 is bad and form2 is bad and points is low then result is home
- RULE 33 : if form1 is bad and form2 is notbad then result is away
- RULE 34 : if form1 is bad and form2 is avg then result is away
- RULE 35 : if form1 is bad and form2 is notgreat then result is away
- RULE 36 : if form1 is bad and form2 is great then result is away
+    RULE 34 : if form1 is avg and form2 is avg and points is low then result is away
+    RULE 35 : if form1 is avg and form2 is avg and points is avg then result is draw
+    RULE 36 : if form1 is avg and form2 is avg and points is high then result is home
+
+ // rozbicie away
+ RULE 37 : if form1 is avg and form2 is great and points is low then result is away
+ RULE 38 : if form1 is avg and form2 is great and points is avg then result is draw
+ RULE 39 : if form1 is avg and form2 is great and points is high then result is home
+    // rozbicie
+    RULE 61 : if form1 is bad and form2 is bad and points is low then result is away
+    RULE 62 : if form1 is bad and form2 is bad and points is avg then result is draw
+    RULE 63 : if form1 is bad and form2 is bad and points is high then result is home
+
+ // to rozbicie nic nie daje
+ RULE 66 : if form1 is bad and form2 is avg then result is away
+ // rozbicie away
+ RULE 67 : if form1 is bad and form2 is great and points is low then result is away
+ RULE 68 : if form1 is bad and form2 is great and points is avg then result is draw
+ RULE 69 : if form1 is bad and form2 is great and points is low then result is draw
 
 
 END_RULEBLOCK