s460941/LSR
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed baseline

Browse Source
This commit is contained in:
s460941 2020-06-09 17:11:27 +02:00
parent cd40e018ae
commit 3ae5edcc49
3 changed files with 45 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.idea/workspace.xml
View File

@ -2,12 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0fc070d1-3753-43f5-b5e7-37c2bc110b95" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<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="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -24,22 +22,16 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="1crcekCL4FTLhoGCTKkOfpvbDrP" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true">
<module name="LSR2" />
@ -91,13 +83,36 @@
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="WindowStateProjectService">
<state x="291" y="120" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1591713379914">
<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="284" key="GridCell.Tab.0.bottom" timestamp="1591715422110">
<screen x="67" y="27" width="1533" height="873" />
</state>
<state width="1510" height="284" key="GridCell.Tab.0.bottom/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591715422110" />
<state width="1510" height="284" key="GridCell.Tab.0.center" timestamp="1591715422110">
<screen x="67" y="27" width="1533" height="873" />
</state>
<state width="1510" height="284" key="GridCell.Tab.0.center/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591715422110" />
<state width="1510" height="284" key="GridCell.Tab.0.left" timestamp="1591715422110">
<screen x="67" y="27" width="1533" height="873" />
</state>
<state width="1510" height="284" key="GridCell.Tab.0.left/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591715422110" />
<state width="1510" height="284" key="GridCell.Tab.0.right" timestamp="1591715422110">
<screen x="67" y="27" width="1533" height="873" />
</state>
<state width="1510" height="284" key="GridCell.Tab.0.right/67.27.1533.873/1600.0.1920.1080@67.27.1533.873" timestamp="1591715422110" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url>
<line>39</line>
<line>45</line>
<option name="timeStamp" value="5" />
</line-breakpoint>
</breakpoints>

17
main.py
View File

@ -1,8 +1,14 @@
import os
from fcl_parser import FCLParser
import skfuzzy.control as ctrl
import pandas as pd
def myround(x):
r = 0
if (x < 0): r = x // 1
if (x > 0): r = int(round(x))
return r
teams = pd.read_csv('teams_list.csv')
matches = pd.read_csv('matches_list.csv')
@ -43,9 +49,14 @@ for i in range(0,224):
#module.input['points'] = matches_input[i][2]
module.compute()
x = module.output['result']
y = int(x + (x % (1 if x >= 0 else -1)))
x = float("{:.4f}".format(x))
#y = int(x + (x % (1 if x >= 0 else -1)))
#y = myround(x)
y = int(round(x))
predictions.append(y)
print(str(y) +": " + str(matches_input[i][3]))
#print(str(y) +": " + str(matches_input[i][3]))
print("FCL: " +str(x) + " ROUND: " + str(y) + " GROUND: " + str(matches_input[i][3]))
num = 0
cor = 0

2
worker.fcl
View File

@ -34,7 +34,7 @@ END_FUZZIFY
DEFUZZIFY result
RANGE := (-1.000 .. 1.000);
TERM home := (-1,1) (0,0);
TERM draw := (-0.5,0) (0,1) (0.5,1);
TERM draw := (-0.5,0) (0,1) (0.5,0);
TERM away := (0,0) (1,1);
METHOD : COG;
// ACCU : MAX;