diff --git a/api/s11_patterns.py b/api/s11_patterns.py index 229fbc6..77976f9 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -98,6 +98,13 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet: # ;desc # id mult1 mult2 ..... #-------------------------------------------------------------- +#-------------------------------------------------------------- +# [EPA3][IN][OUT] +# id FIXED (interval) +# id factor1 factor2 ... +# id VARIABLE +# id time1 factor1 time2 factor2 ... +#-------------------------------------------------------------- def inp_in_pattern(line: str) -> str: @@ -118,14 +125,7 @@ def inp_out_pattern(name: str) -> list[str]: return lines -#-------------------------------------------------------------- -# [EPA3][IN][OUT] -# id FIXED (interval) -# id factor1 factor2 ... -# id VARIABLE -# id time1 factor1 time2 factor2 ... -#-------------------------------------------------------------- -def inp_in_pattern_v3(section: list[str]) -> ChangeSet: +'''def inp_in_pattern_v3(section: list[str]) -> ChangeSet: patterns: dict[str, list[float]] = {} variable_patterns: list[str] = [] @@ -158,7 +158,7 @@ def inp_in_pattern_v3(section: list[str]) -> ChangeSet: cs.append(g_add_prefix | {'type': 'pattern', 'id' : id, 'factors' : factors}) #print(descs) - return cs + return cs''' def inp_out_pattern_v3(name: str) -> list[str]: diff --git a/api/s12_curves.py b/api/s12_curves.py index 3adc230..fe297dc 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -126,6 +126,11 @@ def delete_curve(name: str, cs: ChangeSet) -> ChangeSet: # ;type: desc # id x y #-------------------------------------------------------------- +#-------------------------------------------------------------- +# [EPA3][IN][OUT] +# id type +# id x y +#-------------------------------------------------------------- def inp_in_curve(line: str) -> str: @@ -149,12 +154,7 @@ def inp_out_curve(name: str) -> list[str]: return lines -#-------------------------------------------------------------- -# [EPA3][IN][OUT] -# id type -# id x y -#-------------------------------------------------------------- -def inp_in_curve_v3(section: list[str]) -> ChangeSet: +'''def inp_in_curve_v3(section: list[str]) -> ChangeSet: types = {} curves: dict[str, list[dict[str, float]]] = {} @@ -180,7 +180,7 @@ def inp_in_curve_v3(section: list[str]) -> ChangeSet: cs.append(g_add_prefix | {'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords}) #print(descs) - return cs + return cs''' def inp_out_curve_v3(name: str) -> list[str]: