Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/change RMSE to MAPE in the stability charts #131

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Fix/change RMSE to MAPE in the stability charts #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6512bca
Fix/change rmse to mape in formula analysis
L-M-Sherlock Aug 9, 2024
2ea01ea
bump version
L-M-Sherlock Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "FSRS-Optimizer"
version = "5.0.5"
version = "5.0.6"
readme = "README.md"
dependencies = [
"matplotlib>=3.7.0",
Expand Down
15 changes: 11 additions & 4 deletions src/fsrs_optimizer/fsrs_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
from torch.utils.data import Dataset
from torch.nn.utils.rnn import pad_sequence
from sklearn.model_selection import TimeSeriesSplit
from sklearn.metrics import root_mean_squared_error, mean_absolute_error, r2_score
from sklearn.metrics import (
root_mean_squared_error,
mean_absolute_error,
mean_absolute_percentage_error,
r2_score,
)
from scipy.optimize import minimize
from itertools import accumulate
from tqdm.auto import tqdm
Expand Down Expand Up @@ -1272,7 +1277,9 @@ def preview_sequence(self, test_rating_sequence: str, requestRetention: float):
(
f"{ivl}d"
if ivl < 30
else f"{ivl / 30:.1f}m" if ivl < 365 else f"{ivl / 365:.1f}y"
else f"{ivl / 30:.1f}m"
if ivl < 365
else f"{ivl / 365:.1f}y"
)
for ivl in map(int, t_history.split(","))
]
Expand Down Expand Up @@ -1632,14 +1639,14 @@ def cal_stability(tmp):
analysis_group.dropna(inplace=True)
analysis_group.drop_duplicates(subset=[group_key], inplace=True)
analysis_group.sort_values(by=[group_key], inplace=True)
rmse = root_mean_squared_error(
mape = mean_absolute_percentage_error(
analysis_group["true_s"],
analysis_group["predicted_s"],
sample_weight=analysis_group["total_count"],
)
fig = plt.figure()
ax1 = fig.add_subplot(111)
ax1.set_title(f"RMSE={rmse:.2f}, last rating={last_rating}")
ax1.set_title(f"MAPE={mape:.2f}, last rating={last_rating}")
ax1.scatter(
analysis_group[group_key],
analysis_group["true_s"],
Expand Down