opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +8 -2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 20d2e644bc - Show all commits

10
app/comp/moy_ue.py
View File

@ -344,8 +344,12 @@ def compute_ue_moys_classic(
pd.Series( pd.Series(
[val] * len(modimpl_inscr_df.index), index=modimpl_inscr_df.index [val] * len(modimpl_inscr_df.index), index=modimpl_inscr_df.index
), ),
pd.DataFrame(columns=[ue.id for ue in ues], index=modimpl_inscr_df.index), pd.DataFrame(
pd.DataFrame(columns=[ue.id for ue in ues], index=modimpl_inscr_df.index), columns=[ue.id for ue in ues], index=modimpl_inscr_df.index, dtype=float
),
pd.DataFrame(
columns=[ue.id for ue in ues], index=modimpl_inscr_df.index, dtype=float
),
) )
# Restreint aux modules sélectionnés: # Restreint aux modules sélectionnés:
sem_matrix = sem_matrix[:, modimpl_mask] sem_matrix = sem_matrix[:, modimpl_mask]
@ -400,6 +404,7 @@ def compute_ue_moys_classic(
}, },
index=modimpl_inscr_df.index, index=modimpl_inscr_df.index,
columns=[ue.id for ue in ues], columns=[ue.id for ue in ues],
dtype=float,
) )
# remplace NaN par zéros dans les moyennes d'UE # remplace NaN par zéros dans les moyennes d'UE
etud_moy_ue_df_no_nan = etud_moy_ue_df.fillna(0.0, inplace=False) etud_moy_ue_df_no_nan = etud_moy_ue_df.fillna(0.0, inplace=False)
@ -415,6 +420,7 @@ def compute_ue_moys_classic(
coefs.sum(axis=2).T, coefs.sum(axis=2).T,
index=modimpl_inscr_df.index, # etudids index=modimpl_inscr_df.index, # etudids
columns=[ue.id for ue in ues], columns=[ue.id for ue in ues],
dtype=float,
) )
with np.errstate(invalid="ignore"): # ignore les 0/0 (-> NaN) with np.errstate(invalid="ignore"): # ignore les 0/0 (-> NaN)
etud_moy_gen = np.sum( etud_moy_gen = np.sum(