Skip to content

Commit

Permalink
New object for the results
Browse files Browse the repository at this point in the history
  • Loading branch information
michelbierlaire committed Oct 20, 2024
1 parent 490d007 commit c431b1e
Show file tree
Hide file tree
Showing 67 changed files with 15,154 additions and 2,273 deletions.
10 changes: 5 additions & 5 deletions src/biogeme/assisted.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from biogeme.controller import ControllerOperator
from biogeme.exceptions import BiogemeError
from biogeme.parameters import Parameters
from biogeme.results import bioResults
from biogeme.results_processing import EstimationResults
from biogeme.specification import Specification

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -57,7 +57,7 @@ def __init__(
self.database = biogeme_object.database
self.model_names = None

def reestimate(self, recycle: bool = False) -> dict[str, bioResults]:
def reestimate(self, recycle: bool = False) -> dict[str, EstimationResults]:
"""The assisted specification uses quickEstimate to estimate
the models. A complete estimation is necessary to obtain the
full estimation results.
Expand Down Expand Up @@ -136,9 +136,9 @@ class AssistedSpecification(Neighborhood):
def __init__(
self,
biogeme_object: BIOGEME,
multi_objectives: Callable[[bioResults | None], list[float]],
multi_objectives: Callable[[EstimationResults | None], list[float]],
pareto_file_name: str,
validity: Callable[[bioResults], bool] | None = None,
validity: Callable[[EstimationResults], bool] | None = None,
parameter_file: str | None = None,
):
"""Ctor
Expand Down Expand Up @@ -230,7 +230,7 @@ def is_valid(self, element: SetElement) -> tuple[bool, str]:
specification = Specification.from_string_id(element.element_id)
return specification.validity

def run(self) -> dict[str, bioResults]:
def run(self) -> dict[str, EstimationResults]:
"""Runs the VNS algorithm
:return: doct with the estimation results of the Pareto optimal models
Expand Down
Loading

0 comments on commit c431b1e

Please sign in to comment.