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

correct deficit spelling

parent 5f133575
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ if __name__ == "__main__":
    parser.add_argument('--sysname', type=str, help='Name of the system', required=True)
    parser.add_argument('--objective', type=str, help='objective (linear, bilinear)', required=True)
    parser.add_argument('--criteria', type=int, help='criteria (1=nsensors, 2=obs+nsensors, 3=obs+red+nsensors)', required=True)
    parser.add_argument('--reddeficit', action='store_true', help="redundancy defecit")
    parser.add_argument('--reddeficit', action='store_true', help="redundancy deficit")
    parser.add_argument('--overwrite', action='store_true', help='overwrite existing pickle file')

    args = parser.parse_args()
+6 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ import argparse
# soar_integration tools
from tools.soar_utilities import check_incidence, define_system

def build_pgraph(sys_name="ccro", overwrite=False, n_components=3):
def build_pgraph(sys_name="ccro", overwrite=False, n_components=3, arc_splitter=None, arc_equal_composition = None,):
    """
    Build soar process graph object for the CCRO example
    """
@@ -44,11 +44,12 @@ def build_pgraph(sys_name="ccro", overwrite=False, n_components=3):
            [2, -1], # sp1
            [1.5,-1]] # p2
        )

        if arc_splitter is None:
            arc_splitter =[[5 - 1, 6 - 1, 7 - 1]]
        if arc_equal_composition is None:
            arc_equal_composition = [[1-1, 2-1], [5 - 1, 6 - 1, 7 - 1, 8 - 1]]

    if sys_name == "pilot":
    elif sys_name == "pilot":
        incidence = np.array(
            [   # a   b   c   d   e   f   g   h   i   j   k   l
                [+1,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0, -1],  # 1
+536 −2108

File changed.

Preview size limit exceeded, changes collapsed.