Merge branch 'master' into cluster-theo (e5ee7ea9) · Commits · energyincities / pyehub

.gitlab-ci.yml

+9 −9

Original line number	Diff line number	Diff line
		@@ -14,14 +14,14 @@ cache:
		before_script:
		- apt update
		- echo 'y\r' \| apt-get install build-essential
		- pip install -r requirements.txt
		- apt install unzip
		- echo 'y' \| apt-get install curl
		- pip install -r requirements.txt
		- pip install pytest
		- apt install unzip
		- mkdir -p $GLPK_CACHE_DIR
		- "[ -e $GLPK_CACHE_DIR/glpk] \|\| (curl -SLO http://ftp.gnu.org/gnu/glpk/glpk-4.65.tar.gz -o $GLPK_CACHE_DIR/glpk && tar -xzf glpk-4.65.tar.gz && cd glpk-4.65 && ./configure && make && make check && make install && cd ..)"


		test:
		script:
		- pytest

+20 −1

Original line number	Diff line number	Diff line
		@@ -5,10 +5,18 @@ from typing import Iterable
		from collections import namedtuple

		import pulp
		import pulp.solvers
		from contexttimer import Timer

		from pylp.constraint import Constraint
		import warnings


		if pulp.__version__ >= '2.1':
		import pulp.apis.cplex_api as cplex
		import pulp.apis.glpk_api as glpk
		else:
		import pulp.solvers as solvers
		warnings.warn('You are using pulp 2.0 or lower, pulp.apis.core has been changed to pulp.sovers automatically')

		Status = namedtuple("Status", ["status", "time"])

		@@ -54,6 +62,7 @@ def solve(
		for constraint in constraints:
		problem += constraint.construct()

		<<<<<<< HEAD
		if solver == "glpk":
		solver = pulp.solvers.GLPK(msg=verbose)
		elif solver == "glpk-cluster":
		@@ -65,6 +74,16 @@ def solve(
		solver = pulp.solvers.GLPK(msg=verbose, path="/home/theochri/ENV/bin/glpsol")
		elif solver == "cplex":
		solver = pulp.solvers.CPLEX(msg=verbose)
		=======
		if solver == 'glpk' and pulp.__version__ == '2.1':
		solver = glpk.GLPK_CMD(msg=verbose)
		elif solver == 'glpk' and pulp.__version__ != '2.1':
		solver = solvers.GLPK(msg=verbose)
		elif solver == 'cplex' and pulp.__version__ == '2.1':
		solver = cplex.CPLEX_CMD(msg=verbose)
		elif solver == 'cplex' and pulp.__version__ != '2.1':
		solver = solvers.CPLEX(msg=verbose)
		>>>>>>> master
		else:
		raise ValueError(f"Unsupported solver: {solver}")