OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment out pattern and curve v3 version

Browse Source
This commit is contained in:
Joey Wang
2023-03-22 12:18:07 +08:00
parent 398ba09106
commit 0fc34ae1ff
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/s11_patterns.py
View File

@@ -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]:

14
api/s12_curves.py
View File

@@ -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]: