Skip to content

Commit

Permalink
master core: accept one hot datasets
Browse files Browse the repository at this point in the history
  • Loading branch information
manuel committed Sep 20, 2024
1 parent 0ef7032 commit fb730c1
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Dashboard/metrics/metricsLayout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ def generate_regression_metrics(y, y_pred, keys, parametersTranslations):
f"{keys['r2']}": round(r2_score(y, y_pred), 4),
}

print('y1: ', (y - y_pred))
print('y2: ', (y - y_pred) / y)
print('y3: ', np.abs((y - y_pred) / y))
# print('y1: ', (y - y_pred))
# print('y2: ', (y - y_pred) / y)
# print('y3: ', np.abs((y - y_pred) / y))

descriptions = {
f"{keys['mse']}": setText(parametersTranslations, 'mse-tooltip', 'dashboard.metrics.regressor.parameters'),
Expand Down
2 changes: 1 addition & 1 deletion Dashboard/specificTrees/specificTreesLayout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ def refresh_specificTrees_layout(_, tree_number, cl):
if jindex > 0:
value_cell += f" o {value}"
else:
value_cell += value
value_cell += f"{value}"

causes.append(
html.Tr(
Expand Down
2 changes: 1 addition & 1 deletion Dashboard/surrogate/surrogateLayout.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def refresh_surrogate_layout(max_depht, _, cl):
if jindex > 0:
value_cell += f" o {value}"
else:
value_cell += value
value_cell += f"{value}"
causes.append(
html.Tr(
[
Expand Down
10 changes: 6 additions & 4 deletions app/processor/routes.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ def save_classifier(modelId: int = 0):
'possible_q': 1 if len(set(df[column])) < 5 or column == db_model.target_row else 0,
'current_val': descriptions[column] if modelId else '',
'variable_data': {
"values": list(set(df[column])),
"values": [val if not isinstance(val, bool) else str(val) for val in list(set(df[column]))],
"values_on_current": values_on_current[column] if modelId and values_on_current.get(
column) else []
}
Expand Down Expand Up @@ -531,10 +531,11 @@ def save_classifier(modelId: int = 0):
}
else:
old_value = element.replace(f"{q_dict['column_name']}-", "")
old_value = False if old_value == 'false' else True if old_value == 'true' else old_value
new_value = (
request.form[element]
if request.form[element] != ""
else old_value
else old_value if not isinstance(old_value, bool) else str(old_value).lower()
)
try:
old_value = int(old_value)
Expand Down Expand Up @@ -755,7 +756,7 @@ def save_regressor(modelId: int = 0):
'possible_q': 1 if len(set(df[column])) <= 5 and column != db_model.target_row else 0,
'current_val': descriptions[column] if modelId else '',
'variable_data': {
"values": list(set(df[column])),
"values": [val if not isinstance(val, bool) else str(val) for val in list(set(df[column]))],
"values_on_current": values_on_current[column] if modelId and values_on_current.get(
column) else []
}
Expand Down Expand Up @@ -808,10 +809,11 @@ def save_regressor(modelId: int = 0):
}
else:
old_value = element.replace(f"{q_dict['column_name']}-", "")
old_value = False if old_value == 'false' else True if old_value == 'true' else old_value
new_value = (
request.form[element]
if request.form[element] != ""
else old_value
else old_value if not isinstance(old_value, bool) else str(old_value).lower()
)
try:
old_value = int(old_value)
Expand Down
9 changes: 5 additions & 4 deletions app/processor/templates/add_model_classifier.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,25 +178,26 @@ <h5 class="q-vars-header" id="q-vars-title"></h5>

if (values_on_current.length !== 0) {
for (let i = 0; i < values.length; i++) {

const value = values[i] == 'False' ? false : (values[i] == 'True'? true : values[i])
if (values[i] != values_on_current[i]) {
htmlFormEdit +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" value="${values_on_current[i]}"/>
<input class="form-control custom-input q-vars-text" oldValue="${value}" type="text" name="${name}-${value}" value="${values_on_current[i]}"/>
</div>`;
} else {
htmlFormEdit +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" />
<input class="form-control custom-input q-vars-text" oldValue="${value}" type="text" name="${name}-${value}" />
</div>`;
}
}
htmlFormCreate = null;
} else {
for (let i = 0; i < values.length; i++) {
const value = values[i] == 'False' ? false : (values[i] == 'True'? true : values[i])
htmlFormCreate +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" />
<input class="form-control custom-input q-vars-text" oldValue="${value}" type="text" name="${name}-${value}" />
</div>`;
}
htmlFormEdit = null;
Expand Down
9 changes: 5 additions & 4 deletions app/processor/templates/add_model_regressor.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,25 +188,26 @@ <h5 class="q-vars-header" id="q-vars-title"></h5>

if (values_on_current.length !== 0) {
for (let i = 0; i < values.length; i++) {

const value = values[i] == 'False' ? false : (values[i] == 'True'? true : values[i])
if (values[i] != values_on_current[i]) {
htmlFormEdit +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" value="${values_on_current[i]}"/>
<input class="form-control custom-input q-vars-text" oldValue="${value}" type="text" name="${name}-${value}" value="${values_on_current[i]}"/>
</div>`;
} else {
htmlFormEdit +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" />
<input class="form-control custom-input q-vars-text" oldValue="${values}" type="text" name="${name}-${value}" />
</div>`;
}
}
htmlFormCreate = null;
} else {
for (let i = 0; i < values.length; i++) {
const value = values[i] == 'False' ? false : (values[i] == 'True'? true : values[i])
htmlFormCreate +=
`<div class="custom-col-no-media">
<input class="form-control custom-input q-vars-text" oldValue="${values[i]}" type="text" name="${name}-${values[i]}" />
<input class="form-control custom-input q-vars-text" oldValue="${value}" type="text" name="${name}-${value}" />
</div>`;
}
htmlFormEdit = null;
Expand Down
Binary file modified instance/database.db
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions run.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
Migrate(app, db)

if __name__ == "__main__":
app.run(debug=False)
# app.run(debug=True)
# app.run(debug=False)
app.run(debug=True)

0 comments on commit fb730c1

Please sign in to comment.