s487194/SystemyRozmyte
1
0
Fork 0
forked from s452662/SystemyRozmyte
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Last 5 matches between teams added to data_filters, fix shots fuzzy rules #1

Open
s487194 wants to merge 1 commits from new-func into master
pull from: new-func
merge into: s487194:master
Conversation 0 Commits 1 Files Changed 2 +11 -5
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 089139b660 - Show all commits

7
data_filters.py
View File

@ -29,6 +29,13 @@ def last5Matches(season, teamA, data, df):
return last_before_date return last_before_date
def last5MatchesBtwTeams(teamA, teamB, data, df):
subset = df[(((df['home_team'] == teamA) | (df['away_team'] == teamA)) & ((df['home_team'] == teamB) | (df['away_team'] == teamB)))]
before_given_date = subset[pd.to_datetime(subset['date']) < pd.to_datetime(data)]
before_given_date = before_given_date.sort_values(by='date', ascending=False)
last_before_date = before_given_date.head(5)
return last_before_date
def seasonMatches(season, teamA, data, df): def seasonMatches(season, teamA, data, df):
# Wybierz rekordy dla danej pary drużyn i sezonu # Wybierz rekordy dla danej pary drużyn i sezonu

9
rules.py
View File

@ -104,14 +104,13 @@ def categorize_fuzzy_shots(shots_overall, shots_on_target):
"IF (shots_overall IS high ) AND (shots_on_target IS low) THEN (quality_of_shots IS low)", "IF (shots_overall IS high ) AND (shots_on_target IS low) THEN (quality_of_shots IS low)",
"IF (shots_overall IS average) AND (possession IS high) THEN (quality_of_shots IS high)", "IF (shots_overall IS average) AND (shots_on_target IS high) THEN (quality_of_shots IS high)",
"IF (passes IS high) AND (possession IS average) THEN (quality_of_shots IS high)", "IF (shots_overall IS high) AND (shots_on_target IS average) THEN (quality_of_shots IS average)",
"IF (passes IS low) AND (possession IS average) THEN (quality_of_shots IS low)", "IF (shots_overall IS low) AND (shots_on_target IS average) THEN (quality_of_shots IS average)",
"IF (passes IS average) AND (possession IS low) THEN (quality_of_shots IS average)"
"IF (shots_overall IS average) AND (shots_on_target IS low) THEN (quality_of_shots IS low)"
]) ])