mirror of https://gitlab.com/pamhyr/pamhyr2
Results: Minor change.
parent
2859d0f4ff
commit
bb33e8077a
|
|
@ -20,20 +20,29 @@ import numpy as np
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
|
from Model.Scenario import Scenario
|
||||||
|
from Model.Tools.PamhyrDB import SQLSubModel
|
||||||
from Model.Results.River.River import River
|
from Model.Results.River.River import River
|
||||||
|
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
|
|
||||||
class Results(object):
|
class Results(SQLSubModel):
|
||||||
|
_SQL_TABLE = "solver_results"
|
||||||
|
|
||||||
def __init__(self, study=None, solver=None,
|
def __init__(self, study=None, solver=None,
|
||||||
repertory="", name="0"):
|
repertory="", name="0"):
|
||||||
|
super(Results, self).__init__(
|
||||||
|
status=study.status,
|
||||||
|
owner_scenario=study.status.scenario.id
|
||||||
|
)
|
||||||
|
|
||||||
|
self._name = name
|
||||||
self._study = study
|
self._study = study
|
||||||
|
self._river = River(self._study)
|
||||||
|
|
||||||
self._solver = solver
|
self._solver = solver
|
||||||
self._repertory = repertory
|
self._repertory = repertory
|
||||||
self._name = name
|
|
||||||
|
|
||||||
self._river = River(self._study)
|
|
||||||
|
|
||||||
self._meta_data = {
|
self._meta_data = {
|
||||||
# Keep results creation date
|
# Keep results creation date
|
||||||
|
|
|
||||||
|
|
@ -145,7 +145,7 @@ class AbstractSolver(object):
|
||||||
|
|
||||||
@timer
|
@timer
|
||||||
def results(self, study, repertory, qlog=None):
|
def results(self, study, repertory, qlog=None):
|
||||||
results = Results(study=study)
|
results = Results(study=study, repertory=repertory)
|
||||||
return results
|
return results
|
||||||
|
|
||||||
#######
|
#######
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue