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:13:14 +02:00
parent 3ae5edcc49
commit 7d3410874e
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.idea/workspace.xml
View File

@ -4,7 +4,6 @@
<list default="true" id="0fc070d1-3753-43f5-b5e7-37c2bc110b95" name="Default Changelist" comment=""> <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$/.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$/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> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -112,7 +111,7 @@
<breakpoints> <breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line"> <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/main.py</url> <url>file://$PROJECT_DIR$/main.py</url>
<line>45</line> <line>38</line>
<option name="timeStamp" value="5" /> <option name="timeStamp" value="5" />
</line-breakpoint> </line-breakpoint>
</breakpoints> </breakpoints>

10
main.py
View File

@ -2,13 +2,6 @@ from fcl_parser import FCLParser
import skfuzzy.control as ctrl import skfuzzy.control as ctrl
import pandas as pd 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') teams = pd.read_csv('teams_list.csv')
matches = pd.read_csv('matches_list.csv') matches = pd.read_csv('matches_list.csv')
@ -51,11 +44,8 @@ for i in range(0,224):
x = module.output['result'] x = module.output['result']
x = float("{:.4f}".format(x)) x = float("{:.4f}".format(x))
#y = int(x + (x % (1 if x >= 0 else -1)))
#y = myround(x)
y = int(round(x)) y = int(round(x))
predictions.append(y) predictions.append(y)
#print(str(y) +": " + str(matches_input[i][3]))
print("FCL: " +str(x) + " ROUND: " + str(y) + " GROUND: " + str(matches_input[i][3])) print("FCL: " +str(x) + " ROUND: " + str(y) + " GROUND: " + str(matches_input[i][3]))
num = 0 num = 0