ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 01:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace Hashable by str

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-07-15 16:21:40 -05:00
parent 8d89285cb9
commit ef9c48d79a
21 changed files with 123 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
miplearn/problems/knapsack.py
View File

@@ -1,7 +1,8 @@
# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
# Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details.
from typing import List, Dict, Optional, Hashable, Any
from typing import List, Dict, Optional
import numpy as np
import pyomo.environ as pe
@@ -10,7 +11,6 @@ from scipy.stats import uniform, randint, rv_discrete
from scipy.stats.distributions import rv_frozen
from miplearn.instance.base import Instance
from miplearn.types import VariableName, Category
class ChallengeA:

5
miplearn/problems/stab.py
View File

@@ -1,7 +1,7 @@
# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
# Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details.
from typing import List, Dict, Hashable
from typing import List, Dict
import networkx as nx
import numpy as np
@@ -12,7 +12,6 @@ from scipy.stats import uniform, randint
from scipy.stats.distributions import rv_frozen
from miplearn.instance.base import Instance
from miplearn.types import VariableName, Category
class ChallengeA:
@@ -85,7 +84,7 @@ class MaxWeightStableSetInstance(Instance):
return features
@overrides
def get_variable_categories(self) -> Dict[str, Hashable]:
def get_variable_categories(self) -> Dict[str, str]:
return {f"x[{v}]": "default" for v in self.nodes}

7
miplearn/problems/tsp.py
View File

@@ -1,7 +1,7 @@
# MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
# Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
# Released under the modified BSD license. See COPYING.md for more details.
from typing import List, Tuple, FrozenSet, Any, Optional, Hashable, Dict
from typing import List, Tuple, FrozenSet, Any, Optional, Dict
import networkx as nx
import numpy as np
@@ -11,10 +11,9 @@ from scipy.spatial.distance import pdist, squareform
from scipy.stats import uniform, randint
from scipy.stats.distributions import rv_frozen
from miplearn.instance.base import Instance
from miplearn.solvers.learning import InternalSolver
from miplearn.solvers.pyomo.base import BasePyomoSolver
from miplearn.instance.base import Instance
from miplearn.types import VariableName, Category
class ChallengeA:
@@ -82,7 +81,7 @@ class TravelingSalesmanInstance(Instance):
return model
@overrides
def get_variable_categories(self) -> Dict[str, Hashable]:
def get_variable_categories(self) -> Dict[str, str]:
return {f"x[{e}]": f"x[{e}]" for e in self.edges}
@overrides