From bb33e8077a9f8e5ec868b6784fbb32e2393c7fde Mon Sep 17 00:00:00 2001 From: Pierre-Antoine Rouby Date: Tue, 24 Sep 2024 15:41:32 +0200 Subject: [PATCH] Results: Minor change. --- src/Model/Results/Results.py | 17 +++++++++++++---- src/Solver/ASolver.py | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/Model/Results/Results.py b/src/Model/Results/Results.py index 3219c21f..adc245f9 100644 --- a/src/Model/Results/Results.py +++ b/src/Model/Results/Results.py @@ -20,20 +20,29 @@ import numpy as np from copy import deepcopy from datetime import datetime +from Model.Scenario import Scenario +from Model.Tools.PamhyrDB import SQLSubModel from Model.Results.River.River import River logger = logging.getLogger() -class Results(object): +class Results(SQLSubModel): + _SQL_TABLE = "solver_results" + def __init__(self, study=None, solver=None, repertory="", name="0"): + super(Results, self).__init__( + status=study.status, + owner_scenario=study.status.scenario.id + ) + + self._name = name self._study = study + self._river = River(self._study) + self._solver = solver self._repertory = repertory - self._name = name - - self._river = River(self._study) self._meta_data = { # Keep results creation date diff --git a/src/Solver/ASolver.py b/src/Solver/ASolver.py index adbcdd16..7f5b7ab4 100644 --- a/src/Solver/ASolver.py +++ b/src/Solver/ASolver.py @@ -145,7 +145,7 @@ class AbstractSolver(object): @timer def results(self, study, repertory, qlog=None): - results = Results(study=study) + results = Results(study=study, repertory=repertory) return results #######