Skip to content

Commit

Permalink
de-duplicate function
Browse files Browse the repository at this point in the history
  • Loading branch information
payetvin committed Mar 18, 2024
1 parent 081b4a0 commit 084b625
Showing 1 changed file with 10 additions and 27 deletions.
37 changes: 10 additions & 27 deletions scripts/generate_reference.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,46 +15,29 @@
root = Path(args.root).resolve()
solver_path = Path(args.solver).resolve()

def find_solver(solver):
def find_binary(path, binary_name):
if sys.platform.startswith("win"):
suffix=".exe"
else:
suffix=""

solver_path = Path(solver)
if solver_path.is_file():
return solver.resolve()
if solver_path.is_dir():
binary_path = Path(path)
if binary_path.is_file():
return path.resolve()
if binary_path.is_dir():
results = []
for x in solver_path.iterdir():
if x.is_file() and (f"antares-solver{suffix}" == x.name):
for x in binary_path.iterdir():
if x.is_file() and (f"antares-{binary_name}{suffix}" == x.name):
results.append(x)
assert(len(results) == 1)
return results[0].resolve()
raise RuntimeError("Missing solver")
raise RuntimeError("Missing {binary_name}")

def find_tsgenerator(tsgenerator):
if sys.platform.startswith("win"):
suffix=".exe"
else:
suffix=""

tsgenerator_path = Path(tsgenerator)
if tsgenerator_path.is_file():
return tsgenerator.resolve()
if tsgenerator_path.is_dir():
results = []
for x in tsgenerator_path.iterdir():
if x.is_file() and (f"antares-ts-generator{suffix}" == x.name):
results.append(x)
assert(len(results) == 1)
return results[0].resolve()
raise RuntimeError("Missing ts-generator")

solver_path = find_solver(args.solver)
solver_path = find_binary(args.solver, "solver")
print(f"Found solver {solver_path}")

tsgenerator_path = find_tsgenerator(args.solver)
tsgenerator_path = find_binary(args.solver, "ts-generator")
print(f"Found ts-generator {tsgenerator_path}")

studies = antares_utils.list_studies(root)
Expand Down

0 comments on commit 084b625

Please sign in to comment.