mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
rep mage select fixed
This commit is contained in:
1 parent
3c82148f44
commit
75149000db
5 files changed
+601
-11
No files matched your search
@@ -112,7 +112,7 @@ class AdisTS(CommandLineSolver):
|
||||
for line in lines:
|
||||
rep_file.write(line.line)
|
||||
|
||||
def _export_REP(self, study, repertory, files, qlog, name="0"):
|
||||
def _export_REP(self, study, repertory, mage_rep, files, qlog, name="0"):
|
||||
|
||||
if qlog is not None:
|
||||
qlog.put("Export REP file")
|
||||
@@ -124,8 +124,8 @@ class AdisTS(CommandLineSolver):
|
||||
), "w+"
|
||||
) as f:
|
||||
|
||||
f.write(f"NET ../default-mage/{name}.NET\n")
|
||||
f.write(f"REP ../default-mage/{name}.REP\n")
|
||||
f.write(f"NET ../{mage_rep}/{name}.NET\n")
|
||||
f.write(f"REP ../{mage_rep}/{name}.REP\n")
|
||||
|
||||
for file in files:
|
||||
EXT = file.split('.')[1]
|
||||
@@ -133,7 +133,7 @@ class AdisTS(CommandLineSolver):
|
||||
|
||||
self._export_REP_additional_lines(study, f)
|
||||
|
||||
path_mage_net = os.path.join(os.path.abspath(os.path.join(repertory, os.pardir)), f"default-mage/net")
|
||||
path_mage_net = os.path.join(os.path.abspath(os.path.join(repertory, os.pardir)), f"{mage_rep}/net")
|
||||
path_adists_net = os.path.join(repertory, "net")
|
||||
|
||||
if os.path.exists(path_mage_net):
|
||||
@@ -466,7 +466,7 @@ class AdisTSlc(AdisTS):
|
||||
]
|
||||
|
||||
@timer
|
||||
def export(self, study, repertory, qlog=None, name="0"):
|
||||
def export(self, study, repertory, mage_rep, qlog=None, name="0"):
|
||||
print("cmd solver adistslc : ", self._cmd_solver)
|
||||
self._study = study
|
||||
name = study.name.replace(" ", "_")
|
||||
@@ -479,7 +479,7 @@ class AdisTSlc(AdisTS):
|
||||
files = files + func(study, repertory, qlog, name=name)
|
||||
|
||||
self.export_additional_files(study, repertory, qlog, name=name)
|
||||
self._export_REP(study, repertory, files, qlog, name=name)
|
||||
self._export_REP(study, repertory, mage_rep, files, qlog, name=name)
|
||||
|
||||
return True
|
||||
except Exception as e:
|
||||
|
||||
Reference in new issue
Block a user