Fix Integration block 0 error, update folder structure for Eclipse project

Author: mjklopfer

.DS_Store

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>OfficialGitRepo</name>
+	<name>PLSIM</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -14,4 +14,4 @@
 	<natures>
 		<nature>org.python.pydev.pythonNature</nature>
 	</natures>
-</projectDescription>
+</projectDescription>

PLSim1.2/.idea/PLSim1.2.iml renamed to .idea/PLSim1.2.iml

@@ -4,6 +4,7 @@
 import pickle
 import numpy as np
 import sys
+from io import StringIO #this line may be needed if not present in your python setup
 from pathlib import Path
 
 #***NOTICE:: Run through project "PLSim 1.2" as the set relative location within the entire project. 
@@ -123,7 +124,7 @@ def print_to_console(file_name, device_map, integral_array,integration_period,de
             energy = make_integral_array((state_np*device_map[device][state]['power']),integration_period)[-1]
             print(f'Device Name: {device:<50s}\t\tState: {state:<20s} Taken Entered Period: {enter_p:>7.3f}%\tTaken Whole Day Period: {day_p:>7.3f}%\tDaily Usage: {energy:>8.2f} Wh')
     # Total Usage
-    print('\nDaily Energy Usage:')
+    print('\nPeriod Energy Usage:')
     for device_name in device_cate_map:
         power = make_integral_array(device_cate_map[device_name]['power'], integration_period)
         print(f"Device:\t\t{device_name:<50s} {power[-1]:>8.3f} Wh")

PLSim1.2/.idea/encodings.xml renamed to .idea/encodings.xml

@@ -11,8 +11,9 @@
 #            a modified file path corresponding to this new file structure ***
 
 # input files
+#Note, use your project's local folder as the reference point!
 #INPUT_XML = "simulationfiles/devicedatabases/xmls/PLSim2Format.xml" #This is the input power usage "database" format
-INPUT_XML = "simulationfiles/devicedatabases/xmls/DeviceList_xml.xml"
+INPUT_XML = "simulationfiles/devicedatabases/xmls/DeviceListDB7.27.19.xml"
 
 # output files
 OUTPUT_PICKLE = 'simulationfiles/scheduleobjects/run_params' #this is the pickled object file passed with the selected device list onto the calculation engine
@@ -155,7 +156,7 @@ def run_sim_state(integration_period: int, input_generators: list):
         elif inp == 'r':
             input_generators = make_input_generators(device_map)
             # Get Integration Period
-            integration_period = input_int('Enter integration period for simulation calculation framework (whole seconds): ')
+            integration_period = input_int('Enter block period for simulation calculation framework (specify number of units that fit in an hour - e.g. 1 minute=60): ')
             # Get Periods
             run_sim_state(integration_period, input_generators)
             # run_sim(integration_period, input_generators)

PLSim1.2/.idea/inspectionProfiles/Project_Default.xml renamed to .idea/inspectionProfiles/Project_Default.xml

@@ -6,14 +6,20 @@
 num_graphs = 1
 
 def make_integral_array(power_array: list, integration_period: int):
-    to_return = [0]
-    for i in range(len(power_array)-1):
-        to_return.append(energy_used(power_array[i:i+2], integration_period) + to_return[-1])
+    to_return = [0] #initialize the array with a 0
+    for i in range(len(power_array)): #previously, len(power_array)-1, this would never evaluate length 1 arrays
+        to_return.append(energy_used(power_array[i:i+2], integration_period) + to_return[-1]) #after first array entry, add new value to appended value
     return to_return
 
 def energy_used(power_array, int_period: int):
-    '''trapezoidal riemman sum estimate of the amount of power used'''
-    return (sum(power_array[1:])/3600*int_period + sum(power_array[:len(power_array)-1])/3600*int_period)/2
+    ''' Integrate the array given period length per hour'''
+    #return (sum(power_array[1:])/3600*int_period + sum(power_array[:len(power_array)-1])/3600*int_period)/2 # or     #return ((sum(power_array[1:]))/(int_period * len(power_array))) #previously, len(power_array)-1, this would never evaluate length 1 arrays, prior '''trapezoidal riemman sum estimate of the amount of power used'''
+    #return(np.trapz(power_array,dx=(int_period/3600)))#print (np.trapz(power_array,dx=(int_period/3600))) #debug print out of step integration value, the problem here is this needs a range, but we are using unitary periods
+    return(sum(power_array)/len(power_array)*(int_period/3600)) #calculate with unitary period addition versus integration
+
+    
+
+    
 
 def make_graph(data: list, int_period, x_label, y_label, title, fig, sub)-> None:
     ''' graphs the data from the list using each point as a y coordinate in the line graph