Skip to content

Commit

Permalink
Removed some unused imports, updated lock file, updated requirements.
Browse files Browse the repository at this point in the history
  • Loading branch information
gialmisi committed Jun 3, 2020
1 parent 0f280e5 commit d617a44
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 912 deletions.
10 changes: 6 additions & 4 deletions desdeo_mcdm/interactive/InteractiveMethod.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from typing import List

from desdeo_problem.Problem import MOProblem

from desdeo_tools.interaction.request import BaseRequest


class InteractiveMethod:
"""The base class for interactive methods.
Args:
problem (MOProblem): The problem being solved in an interactive method.
"""

def __init__(self, problem: MOProblem):
self._problem = problem
9 changes: 3 additions & 6 deletions desdeo_mcdm/interactive/NIMBUS.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
import numpy as np
import pandas as pd
from desdeo_problem.Problem import MOProblem

from desdeo_mcdm.interactive.InteractiveMethod import InteractiveMethod
from desdeo_mcdm.utilities.solvers import payoff_table_method
from desdeo_tools.interaction.request import BaseRequest, SimplePlotRequest
from desdeo_tools.scalarization.ASF import AugmentedGuessASF, MaxOfTwoASF, PointMethodASF, SimpleASF, StomASF
from desdeo_tools.scalarization.Scalarizer import Scalarizer
from desdeo_tools.solver.ScalarSolver import ScalarMethod, ScalarMinimizer

from desdeo_mcdm.interactive.InteractiveMethod import InteractiveMethod
from desdeo_mcdm.utilities.solvers import payoff_table_method


class NimbusException(Exception):
"""Risen when an error related to NIMBUS is encountered.
Expand Down Expand Up @@ -925,12 +925,9 @@ def iterate(


if __name__ == "__main__":
from desdeo_problem.Problem import MOProblem
from desdeo_problem.Objective import _ScalarObjective
from desdeo_problem.Variable import variable_builder
from desdeo_problem.Constraint import ScalarConstraint
from desdeo_tools.scalarization.Scalarizer import Scalarizer
from scipy.optimize import differential_evolution

# create the problem
def f_1(x):
Expand Down

0 comments on commit d617a44

Please sign in to comment.