diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 89b2234..964f33f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,6 @@
-
-
@@ -92,42 +90,42 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -138,8 +136,18 @@
file://$PROJECT_DIR$/main.py
- 98
-
+ 119
+
+
+
+ file://$PROJECT_DIR$/main.py
+ 120
+
+
+
+ file://$PROJECT_DIR$/main.py
+ 121
+
diff --git a/main.py b/main.py
index a1956b5..9a2a9eb 100644
--- a/main.py
+++ b/main.py
@@ -101,9 +101,9 @@ for i in range(0,matches.shape[0]):
x = float("{:.4f}".format(x))
#y = int(round(x))
- if x > 0.2:
+ if x > 0.1:
y = 1
- elif x < -0.2:
+ elif x < -0.1:
y = -1
else:
y = 0
@@ -112,10 +112,21 @@ for i in range(0,matches.shape[0]):
num = 0
cor = 0
+home_count = 0
+draw_count = 0
+away_count = 0
+
for i in range(0,matches.shape[0]):
+ if (matches_input[i][5] == -1): home_count+=1
+ if (matches_input[i][5] == 0): draw_count += 1
+ if (matches_input[i][5] == 1): away_count += 1
if(predictions[i]==matches_input[i][5]):
cor+=1
num+=1
else:
num+=1
+from collections import Counter
+print("Predictions: " + str(Counter(predictions).keys()))
+print("Predictions: " + str(Counter(predictions).values()))
+print("GT: " + str(home_count) + " " + str(draw_count) + " " + str(away_count))
print(float(cor/num))
diff --git a/worker.fcl b/worker.fcl
index 1f6ba71..9774e17 100644
--- a/worker.fcl
+++ b/worker.fcl
@@ -28,9 +28,9 @@ END_FUZZIFY
FUZZIFY points
RANGE := (-30.000 .. 30.000);
- TERM low := (-20,1)(-5,0);
+ TERM low := (-25,1)(-10,0);
TERM avg := (-10,0)(-3,1)(3,1)(10,0);
- TERM high := (10,0)(20,1);
+ TERM high := (10,0)(25,1);
END_FUZZIFY
FUZZIFY xGform1
@@ -65,31 +65,28 @@ RULEBLOCK
RULE 0 : if form1 is great 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 1 : if form1 is great and form2 is avg and points is avg and (xGform1 is luck or xGform2 is badluck) then result is draw
RULE 4 : if form1 is great and form2 is avg and points is avg then result is home
- RULE 2 : if form1 is great and form2 is avg and points is high and (xGform1 is luck or xGform2 is badluck) then result is draw
RULE 5 : if form1 is great and form2 is avg and points is high then result is home
//rozbicie
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 7 : if form1 is great and form2 is great and points is avg then result is home
RULE 8 : if form1 is great and form2 is great and points is high then result is home
//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 31 : if form1 is avg and form2 is bad and points is low then result is draw
+ RULE 32 : if form1 is avg and form2 is bad and points is avg then result is home
RULE 33 : if form1 is avg and form2 is bad and points is high then result is home
//rozbicie
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 35 : if form1 is avg and form2 is avg and points is avg then result is home
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 38 : if form1 is avg and form2 is great and points is avg then result is away
RULE 39 : if form1 is avg and form2 is great and points is high then result is home
- RULE 40 : if form1 is avg and form2 is great and points is high and (xGform1 is badluck or xGform2 is luck) then result is draw
+ RULE 40 : if form1 is avg and form2 is great and points is high and (xGform1 is badluck or xGform2 is luck) 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
@@ -99,8 +96,8 @@ RULEBLOCK
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
+ RULE 68 : if form1 is bad and form2 is great and points is avg then result is away
+ RULE 69 : if form1 is bad and form2 is great and points is high then result is draw
END_RULEBLOCK