Clean and support v3 inp in

api/s11_patterns.py

@@ -1,5 +1,9 @@
 from .database import *
 
+PATTERN_V3_TYPE_FIXED = 'FIXED'
+PATTERN_V3_TYPE_VARIABLE = 'VARIABLE'
+
+pattern_v3_types = [PATTERN_V3_TYPE_FIXED, PATTERN_V3_TYPE_VARIABLE]
 
 def get_pattern_schema(name: str) -> dict[str, dict[str, Any]]:
     return { 'id'      : {'type': 'str'        , 'optional': False , 'readonly': True },
@@ -107,11 +111,15 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet:
 #--------------------------------------------------------------
 
 
-def inp_in_pattern(line: str) -> str:
+def inp_in_pattern(line: str, fixed: bool = True) -> str:
     tokens = line.split()
     sql = ''
-    for token in tokens[1:]:
-        sql += f"insert into patterns (id, factor) values ('{tokens[0]}', {float(token)});"
+    if fixed:
+        for token in tokens[1:]:
+            sql += f"insert into patterns (id, factor) values ('{tokens[0]}', {float(token)});"
+    else:
+        for token in tokens[1::2]:
+            sql += f"insert into patterns (id, factor) values ('{tokens[0]}', {float(token)});"
     return sql
 
 
@@ -125,42 +133,6 @@ def inp_out_pattern(name: str) -> list[str]:
     return lines
 
 
-'''def inp_in_pattern_v3(section: list[str]) -> ChangeSet:
-    patterns: dict[str, list[float]] = {}
-
-    variable_patterns: list[str] = []
-
-    count = len(section)
-    for i in range(0, count):
-        if section[i].startswith(';'):
-            continue
-
-        tokens = section[i].split()
-
-        # for EPA3, ignore time of variable pattern...
-        if tokens[1] == 'VARIABLE':
-            variable_patterns.append(tokens[0])
-            continue
-        elif tokens[1] == 'FIXED':
-            continue
-
-        if tokens[0] not in patterns:
-            patterns[tokens[0]] = []
-        if tokens[0] not in variable_patterns:
-            for token in tokens[1:]:
-                patterns[tokens[0]].append(float(token))
-        else:
-            for token in tokens[1::2]:
-                patterns[tokens[0]].append(float(token))
-
-    cs = ChangeSet()
-    for id, factors in patterns.items():
-        cs.append(g_add_prefix | {'type': 'pattern', 'id' : id, 'factors' : factors})
-
-    #print(descs)
-    return cs'''
-
-
 def inp_out_pattern_v3(name: str) -> list[str]:
     lines = []
     objs = read_all(name, f"select * from patterns order by _order")