Commit 81dc162c authored by Blais, Chris's avatar Blais, Chris
Browse files

update paths for cades open

parent 559e776e

documenting_failures/build_test_cases_nl.py

+2 −2
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ if module_path not in sys.path: 
else:

    print("path already in sys.path")



from setup_example_soar import define_system, get_pareto_front, get_one_result

from documenting_failures.setup_example_soar import define_system, get_pareto_front, get_one_result



# for plotting

import matplotlib.pyplot as plt



# compare to soar

from test_case_nonlinear import constr_mem_nl, labelConstraint

from documenting_failures.test_case_nonlinear import constr_mem_nl, labelConstraint

from numerical_labelling.labelling import jacsym



def build_test_case_nl(ptype=1):

documenting_failures/soar_pgraphs/generate_pgraph.py

+9 −6
Original line number Diff line number Diff line
@@ -10,14 +10,17 @@ from time import time 
if sys.platform == "win32":

    soar_path = os.path.join(r"C:\Users\tjf\Documents\01_gitlab_repos\soar\python")

elif sys.platform == "linux":

    soar_path = os.path.join("/home/tjf/01_wwtp/soar/python/soar")

    soar_path = os.path.join("/home/tjf/01_nawi/soar/python")

if soar_path not in sys.path:

    sys.path.insert(0, soar_path)

else:

    print("soar toolbox already in path")



# add

module_path = os.path.dirname(os.path.abspath(""))

print(soar_path)

assert os.path.exists(soar_path)

module_path = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))

print(module_path)

if module_path not in sys.path:

    sys.path.insert(0, module_path)

else:
@@ -25,7 +28,7 @@ else: 
from soar.graph_labeling.genobs.fGenObs import general_observability

from soar.graph_labeling.genred.fGenRed import genred

from soar.graph_labeling.fDefineSystem import ProcessGraph

from setup_example_soar import define_system, get_pareto_front, get_one_result

from documenting_failures.setup_example_soar import define_system, get_pareto_front, get_one_result

from soar.optimization.fEvaluate import evaluate_obs_red



# for plotting
@@ -34,7 +37,7 @@ import matplotlib.pyplot as plt 
from numerical_labelling.labelling import *



# compare to soar

from build_test_cases_nl import build_test_case_nl, make_layout

from documenting_failures.build_test_cases_nl import build_test_case_nl, make_layout

import soar.optimization.fEvaluate as feval

import matplotlib.pyplot as plt