'0306'

smasky · smasky · commit f63be5077284 · 2026-03-06T09:50:47.000+08:00
diff --git a/UQPyL/problem/base.py b/UQPyL/problem/base.py
@@ -54,7 +54,7 @@ def __init__(self, nInput:int, nOutput:int,
             self.idxF = np.where(self.varType == 0)[0]
             self.idxI = np.where(self.varType == 1)[0]
             self.idxD = np.where(self.varType == 2)[0]
-        
+            
         # Set variable sets for discrete variables
         if varSet is None:
             self.varSet = {}
diff --git a/model/APEX/cost.py b/model/APEX/cost.py
diff --git a/model/APEX/ds_param.yaml b/model/APEX/ds_param.yaml
@@ -1,17 +1,4 @@
 design_parameters:
-  - name: CHN
-    type: float
-    mode: v
-    bounds: [0.015, 0.15]
-    cache: True
-
-
-  - name: SOL_K
-    type: float
-    mode: v
-    bounds: [0.0001, 10]
-    cache: True
-    
   - name: GWSO
     type: float
     mode: v
diff --git a/model/APEX/ds_param_quality.yaml b/model/APEX/ds_param_quality.yaml
@@ -0,0 +1,60 @@
+design_parameters:
+  - name: PRAM7
+    type: float
+    mode: v
+    bounds: [0, 1]
+    cache: True
+  
+  - name: PRAM8
+    type: float
+    mode: v
+    bounds: [10, 20]
+    cache: True
+  
+  - name: PRAM14
+    type: float
+    mode: v
+    bounds: [0.1, 1]
+    cache: True
+  
+  - name: PRAM35
+    type: float
+    mode: v
+    bounds: [0.9, 1.1]
+    cache: True
+  
+  - name: PRAM54
+    type: float
+    mode: v
+    bounds: [0.3, 0.9]
+    cache: True
+
+  - name: PRAM55
+    type: float
+    mode: v
+    bounds: [0.1, 0.3]
+    cache: True
+  
+  - name: PRAM57
+    type: float
+    mode: v
+    bounds: [0.05, 2.0]
+    cache: True
+  
+  - name: PRAM58
+    type: float
+    mode: v
+    bounds: [0.3, 0.9]
+    cache: True
+
+  - name: PRAM59
+    type: float
+    mode: v
+    bounds: [1, 20]
+    cache: True
+
+  - name: PRAM72
+    type: float
+    mode: v
+    bounds: [0.05, 0.5]
+    cache: True
diff --git a/model/APEX/paraLibrary.yaml b/model/APEX/paraLibrary.yaml
@@ -331,3 +331,102 @@ parameter_library:
       precision: 2
       maxNum: 10
   
+  - name: PRAM7
+    type: float
+    bounds: [0, 1]
+    file:
+      name: "PARM1501.DAT"
+      line: 31
+      start: 49
+      width: 8
+      precision: 2
+  
+  - name: PRAM8
+    type: float
+    bounds: [10, 20]
+    file:
+      name: "PARM1501.DAT"
+      line: 31
+      start: 57
+      width: 8
+      precision: 2
+  
+  - name: PRAM14
+    type: float
+    bounds: [0.1, 1]
+    file:
+      name: "PARM1501.DAT"
+      line: 32
+      start: 25
+      width: 8
+      precision: 2
+  
+  - name: PRAM35
+    type: float
+    bounds: [0.9, 1.1]
+    file:
+      name: "PARM1501.DAT"
+      line: 34
+      start: 33
+      width: 8
+      precision: 2
+  
+  - name: PRAM54
+    type: float
+    bounds: [0.3, 0.9]
+    file:
+      name: "PARM1501.DAT"
+      line: 36
+      start: 25
+      width: 8
+      precision: 2
+  
+  - name: PRAM55
+    type: float
+    bounds: [0.1, 0.3]
+    file:
+      name: "PARM1501.DAT"
+      line: 36
+      start: 33
+      width: 8
+      precision: 2
+  
+  - name: PRAM57
+    type: float
+    bounds: [0.05, 2.0]
+    file:
+      name: "PARM1501.DAT"
+      line: 36
+      start: 49
+      width: 8
+      precision: 2
+  
+  - name: PRAM58
+    type: float
+    bounds: [0.3, 0.9]
+    file:
+      name: "PARM1501.DAT"
+      line: 36
+      start: 57
+      width: 8
+      precision: 2
+  
+  - name: PRAM59
+    type: float
+    bounds: [1, 20]
+    file:
+      name: "PARM1501.DAT"
+      line: 36
+      start: 65
+      width: 8
+      precision: 2
+  
+  - name: PRAM72
+    type: float
+    bounds: [0.05, 0.5]
+    file:
+      name: "PARM1501.DAT"
+      line: 38
+      start: 9
+      width: 8
+      precision: 2
diff --git a/model/APEX/runoff.yaml b/model/APEX/runoff.yaml
@@ -1,7 +1,7 @@
 version: general
 
 basic:
-  projectPath: "E:/apex_bian/TxtInOut/TxtInOut"
+  projectPath: "E:/apex_bian/hhapex"
   workPath: "E:/Apex_workPath"
   command: "APEX1501_rel32.exe"
   timeout: 120
diff --git a/model/APEX/sim_model.py b/model/APEX/sim_model.py
@@ -94,14 +94,13 @@ def evaluate(self, X):
         for cte in records:
             i = cte['i']
             if 'error' in cte:
-                objs[i, :] = np.inf   #TODO
+                objs[i, :] = -1 * np.inf #TODO
             else:
                 for j, obj_id in enumerate(self.cfg.objectives.use):
                     if np.isnan(cte[obj_id]):
-                        objs[i, j] = np.inf
+                        objs[i, j] = -1 * np.inf #TODO
                     else:
                         objs[i, j] = cte[obj_id]
-        
         return objs
         
     def _subprocess(self, X, i, batch_id):
diff --git a/model/APEX/temp.py b/model/APEX/temp.py
@@ -0,0 +1,5 @@
+import numpy as np
+
+def transform_tn(runoff, tn):
+    
+    return tn/runoff/30/86.4
diff --git a/model/APEX/temp_apex.py b/model/APEX/temp_apex.py
@@ -5,37 +5,39 @@
 
 apex = SimModel(cfgPath)
 
-from UQPyL.analysis import FAST
+# from UQPyL.analysis import FAST
 
-fast = FAST()
+# fast = FAST()
 
-X = fast.sample(apex, 200)
+# X = fast.sample(apex, 200)
 
-Y = apex.evaluate(X)
-
-res = fast.analyze(apex, X, Y)
+# Y = apex.evaluate(X)
 
+# res = fast.analyze(apex, X, Y)
 
 # from UQPyL.doe import LHS
 
 # lhs = LHS()
-# X = lhs.sample(apex, 10)
+
+# X = lhs.sample(apex, 100)
+
+# Y = apex.evaluate(X)
 
 # X = np.array([57.16922, 257.69545, 30,8.25605,0.56604,0.49416,0.3356,0.00264,0.58426,2.37038,0.96653,4.52535,0.1508,2.78543,1.56767,2.39188,0.28602,2.43478,0.18024,0.01597,0.35966,0.66535,0.29489,0.40602,0.88983,1.29701,1.84515,1.16646,0.96171,23.95696,0.02732
 # ]).reshape(1, -1)
 
-# X = np.array([41.8007,268.02091,46, 7.48015,0.55689,0.32735,0.8633,
-#               0.00258,0.56848,0.53609,0.24591,5.37041,0.2058,4.86825,
-#               1.39641,1.65329,0.1022,2.78815,0.09235,0.09426,0.43786,
-#               0.95824,0.80292,0.15364,0.74659,1.02759,1.70902,1.85659,
-#               0.70676,19.63727,0.02913]).reshape(1, -1)
+X = np.array([41.8007,268.02091,46, 7.48015,0.55689,0.32735,0.8633,
+              0.00258,0.56848,0.53609,0.24591,5.37041,0.2058,4.86825,
+              1.39641,1.65329,0.1022,2.78815,0.09235,0.09426,0.43786,
+              0.95824,0.80292,0.15364,0.74659,1.02759,1.70902,1.85659,
+              0.70676,19.63727,0.02913]).reshape(1, -1)
 
 
 # NAN
 # X = np.array([106.4941451,56.52897001,16,7.650724319,0.566819315,-2.012317419,0,0.002844311,0.570308047,1.405164043,0.320546075,0,0.117799496,5,1.277088966,1.947140682,0.149834391,3.433962163,0.621833414,0,0.5,1.264346194,1,0.283813824,1.434990511,1,0.1,0.532676437,0,22.84456183,0.038962775
 # ]).reshape(1, -1)
 
 
-# objs = apex.evaluate(X)
+objs = apex.evaluate(X)
 
-# a = 1
+a = 1
diff --git a/model/APEX/wq.yaml b/model/APEX/wq.yaml
