Commit c8c44165 authored by Blais, Chris's avatar Blais, Chris
Browse files

update defaults for soar process graph object

parent 6780adb9
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -30,7 +30,11 @@ from soar.optimization.fComputeFrontWithAddedRedundancy import (
import soar.optimization.fEvaluate as feval


def define_system(iIncidence=[], coordinates = [], verbose=5):
def define_system(iIncidence=[], coordinates = [], verbose=5,
                  arcSplitter =[[5 - 1, 6 - 1, 7 - 1]],
                  arcEqualComposition = [[1-1, 2-1], [5 - 1, 6 - 1, 7 - 1, 8-1]],
                  numberOfComponents = 2,
                ):
    if verbose >= 0:
        print("******* DEFINE SYSTEM *******")
        pass
@@ -49,9 +53,9 @@ def define_system(iIncidence=[], coordinates = [], verbose=5):

    iArcEnergy = []
    iArcReaction = []
    iArcSplitter = [[5 - 1, 6 - 1, 7 - 1]]
    iArcEqualComposition = [[1-1, 2-1], [7-1, 8-1]]
    iNumberOfComponent = 2
    iArcSplitter = arcSplitter
    iArcEqualComposition = arcEqualComposition
    iNumberOfComponent = numberOfComponents

    #                       E	C   R   S   SPL
    if len(iIncidence) == 0: 
@@ -507,6 +511,7 @@ def get_one_result(process_graph, layout, objective="linear", verbose=5):
    sens, obs, red = feval.evaluate_obs_red(
        layout,
        process_graph,
        verbose = verbose,
    )

    return sens, obs, red