remove eval

dpinney · Jan 16, 2025 · d52b067 · d52b067
1 parent af397a0
commit d52b067
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/omf/models/hostingCapacity.py b/omf/models/hostingCapacity.py
@@ -130,9 +130,9 @@ def run_ami_algorithm( modelDir, inputDict, outData ):
 		errorMessage = "AMI-Data CSV file is incorrect format. Please see valid format definition at <a target='_blank' href='https://github.com/dpinney/omf/wiki/Models-~-hostingCapacity#meter-data-input-csv-file-format'>OMF Wiki hostingCapacity</a>"
 		raise Exception(errorMessage)
 
-	vv_points_eval = eval(inputDict['vv_points'])
-	vv_x = [x for x,y in vv_points_eval]
-	vv_y = [y for x,y in vv_points_eval]
+	vv_points_eval = [float(x) for x in inputDict['vv_points'].split(',')]
+	vv_x = [v for i,v in enumerate(vv_points_eval) if i%2==0]
+	vv_y = [v for i,v in enumerate(vv_points_eval) if i%2==1]
 
 	AMI_start_time = time.time()
 	if inputDict[ "algorithm" ] == "sandia1":
@@ -265,7 +265,7 @@ def new(modelDir):
 		"traditionalHCMaxTestkw": 50000,
 		"dgInverterSetting": 'unityPF',
 		"der_pf": 0.95,
-		"vv_points": [(0.8,0.44), (0.92, 0.44), (0.98,0), (1.02,0), (1.08,-0.44), (1.2,-0.44)],
+		"vv_points": "0.8,0.44,0.92,0.44,0.98,0,1.02,0,1.08,-0.44,1.2,-0.44",
 		"load_pf_est": 1.0,
 		"runAmiAlgorithm": 'on',
 		"runDownlineAlgorithm": 'on'