parouby/Pamhyr2
1
0 Fork 0
mirror of https://gitlab.com/pamhyr/pamhyr2.git synced 2026-10-30 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

pep8: Some modifications to respect pep8 standard code.

Browse Source
This commit is contained in:
Pierre-Antoine Rouby committed 2023-10-11 11:06:45 +02:00
1 parent 8544dd1144
commit fa2454d079
152 files changed
+1626 -1277
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Model/SolverParameters/SolverParametersList.py
+32 -28
View File
@@ -22,10 +22,11 @@ from Solver.Solvers import solver_type_list
from Model.Tools.PamhyrList import PamhyrModelList
class Parameter():
def __init__(self,
name = "", value = "",
status = None):
name="", value="",
status=None):
self._status = status
self._name = name
@@ -57,14 +58,15 @@ class Parameter():
@classmethod
def from_tuple(cls, data, status):
new = cls(status = status)
new = cls(status=status)
new["name"] = data[0]
new["value"] = data[1]
return new
class SolverParametersList(PamhyrModelList):
def __init__(self, solver_type = None, status = None):
def __init__(self, solver_type=None, status=None):
super(SolverParametersList, self).__init__()
self._status = status
@@ -76,7 +78,6 @@ class SolverParametersList(PamhyrModelList):
)
)
@classmethod
def _sql_create(cls, execute):
execute("""
@@ -97,35 +98,38 @@ class SolverParametersList(PamhyrModelList):
if major == minor == "0":
if int(release) < 3:
execute(f"UPDATE solver_parameter SET name='mage_implicitation' WHERE name='mage_implication'")
execute(f"UPDATE solver_parameter SET name='mage_iteration_type' WHERE name='mage_iter_type'")
execute(
f"UPDATE solver_parameter SET name='mage_implicitation' WHERE name='mage_implication'")
execute(
f"UPDATE solver_parameter SET name='mage_iteration_type' WHERE name='mage_iter_type'")
if int(release) < 4:
solvers = execute("SELECT DISTINCT solver FROM solver_parameter")
solvers = execute(
"SELECT DISTINCT solver FROM solver_parameter")
for solver in solvers:
if solver != "mage8":
continue
data = execute("SELECT ind, name, value " +
"FROM solver_parameter "+
f"WHERE solver = '{solver}' " +
"ORDER BY ind ACS")
"FROM solver_parameter " +
f"WHERE solver = '{solver}' " +
"ORDER BY ind ACS")
execute(
"DELETE FROM solver_parameter " +
f"WHERE solver = '{solver}'"
)
insert = lambda name, value, ind: execute(
"INSERT INTO " +
"solver_parameter(ind, name, value, solver) "+
"VALUES (" +
f"{ind}, " +
f"'{cls._sql_format(name)}', " +
f"'{cls._sql_format(value)}', " +
f"'{cls._sql_format(solver)}'" +
")"
def insert(name, value, ind): return execute(
"INSERT INTO " +
"solver_parameter(ind, name, value, solver) " +
"VALUES (" +
f"{ind}, " +
f"'{cls._sql_format(name)}', " +
f"'{cls._sql_format(value)}', " +
f"'{cls._sql_format(solver)}'" +
")"
)
ind = 0
@@ -156,7 +160,7 @@ class SolverParametersList(PamhyrModelList):
return cls._update_submodel(execute, version)
@classmethod
def _sql_load(cls, execute, data = None):
def _sql_load(cls, execute, data=None):
status = data["status"]
solvers = execute("SELECT DISTINCT solver FROM solver_parameter")
new = {}
@@ -167,7 +171,7 @@ class SolverParametersList(PamhyrModelList):
continue
st = solver_type_list[solver]
n = cls(solver_type = st, status = status)
n = cls(solver_type=st, status=status)
table = execute(
"SELECT ind, name, value " +
@@ -186,7 +190,7 @@ class SolverParametersList(PamhyrModelList):
return new
def _sql_save(self, execute, data = None):
def _sql_save(self, execute, data=None):
t = self._solver._type
execute(
"DELETE FROM solver_parameter " +
@@ -197,7 +201,7 @@ class SolverParametersList(PamhyrModelList):
for param in self._lst:
sql = (
"INSERT INTO " +
"solver_parameter(ind, name, value, solver) "+
"solver_parameter(ind, name, value, solver) " +
"VALUES (" +
f"{ind}, " +
f"'{self._sql_format(param.name)}', " +
@@ -241,15 +245,15 @@ class SolverParametersList(PamhyrModelList):
self._lst.append(
Parameter(
name = key,
value = value,
status = self._status
name=key,
value=value,
status=self._status
)
)
self._status.modified()
def new(self, index):
n = Parameter(status = self._status)
n = Parameter(status=self._status)
self._lst.insert(index, n)
self._status.modified()
return n