Adding creation o plc8 log

Former-commit-id: 52acae2

Author: afmurillo

Demand_patterns/three_year_demands_ctown.csv.REMOVED.git-id

@@ -1 +1 @@
-5612b836670ff87b06c0728d4d0ad6a29e8a55f7
+6ac18184a496f7d29fa6a347e598c9bc22d2b89d

ICS_topologies/enhanced_ctown_topology/automatic_plant.py

@@ -50,15 +50,15 @@ def start_simulation(self):
         wntr_environment_path = home_path + str("/wntr-experiments/bin/python")
         print "Launching simulation for week index: " + str(sys.argv[2])
 
-        cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2]
-        #cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2]
+        #cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2]
+        cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2]
         if len(sys.argv) >= 4:
-            #cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2] + \
-            #             " " + sys.argv[3]
-
-            cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2] + \
+            cmd_string = wntr_environment_path + " physical_process_epynet.py " + sys.argv[1] + " " + sys.argv[2] + \
                          " " + sys.argv[3]
 
+            #cmd_string = wntr_environment_path + " physical_process.py " + sys.argv[1] + " " + sys.argv[2] + \
+            #             " " + sys.argv[3]
+
         cmd = shlex.split(cmd_string)
         simulation = subprocess.Popen(cmd)
         return simulation

ICS_topologies/enhanced_ctown_topology/c_town_config.yaml

@@ -1,7 +1,7 @@
 ---
 # Simulation initialization parameters.
 initial_custom_flag: "True"
-week_index: 25
+week_index: 0
 demand_patterns_path: "../../Demand_patterns/three_year_demands_ctown.csv" # that file was this one. the total demand pattern csv
 starting_demand_path: "../../Demand_patterns/starting_demand_points.csv" # that would be this file
 initial_tank_levels_path: "../../Demand_patterns/tank_initial_conditions.csv" #
@@ -18,7 +18,7 @@ epanet_cpa_path: "../../Demand_patterns/ctown.cpa"
 # General simulation parameters
 db_path: "ctown_db.sqlite"
 output_ground_truth_path: "physical_process.csv"
-duration_days: 10
+duration_days: 1
 inp_file: "ctown_map.inp"
 simulator: "pdd"
 
@@ -47,6 +47,6 @@ simulation_type: "Single"
 # This flag indicates if the experiment will have an attack in the network
 # Using this flag also requires setting the value of attacks_path and attack_name.
 # The attack_name should be present in the attacks_path file
-run_attack: "True"
+run_attack: "False"
 attacks_path: "../../attack_repository/attack_description.yaml"
 attack_name: "network_empty_tank_1"

ICS_topologies/enhanced_ctown_topology/create_log_files.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-files=(plc1 plc2 plc3 plc4 plc5 plc6 plc7 plc9 physical attacker arp_poison scada client server)
+files=(plc1 plc2 plc3 plc4 plc5 plc6 plc7 plc8 plc9 physical attacker arp_poison scada client server)
 
 rm -rf output/*
 

ICS_topologies/enhanced_ctown_topology/physical_process_epynet.py

@@ -4,19 +4,20 @@
 import os
 import pandas as pd
 import yaml
+import traceback
 from decimal import Decimal
 from datetime import datetime
 from utils import T1, T2, T3, T4, T5, T6, T7, PU1, PU2, PU1F, PU2F
 from utils import V2, PU3, PU4, PU5, PU6, PU7, PU8, PU9, PU10, PU11
 from utils import V2F, PU3F, PU4F, PU5F, PU6F, PU7F, PU8F, PU9F, PU10F, PU11F
 from utils import J280, J269, J300, J256, J289, J415, J14, J422, J302, J306, J307, J317, ATT_1, ATT_2
 
-sys.path.insert(1, sys.path[0] + '/epynet/scripts')
+sys.path.insert(1, sys.path[0] + '/DHALSIM-epynet')
 
 print(sys.path)
 
 import network
-import epynet_utils
+import epynetUtils
 
 class PhysicalPlant:
 
@@ -188,16 +189,15 @@ def load_config(self, config_path):
             options = yaml.load(config_file, Loader=yaml.FullLoader)
         return options
 
-
     def configure_demand_patterns(self, patterns_path, starting_demand):
         limit = (self.simulation_days * 24) - 1
-        total_demands = pd.read_csv(patterns_path, index_col=0)
+        total_demands = pd.read_csv(patterns_path)
         demand_starting_points = pd.read_csv(starting_demand, index_col=0)
 
         week_start = demand_starting_points.iloc[self.week_index][0]
         week_demands = total_demands.loc[week_start:week_start + limit, :]
 
-        for pattern in list(self.wn.patterns.keys()):
+        for pattern in self.wn.patterns.uid:
             self.wn.set_demand_pattern(pattern, week_demands[pattern].values.tolist())
 
     def configure_initial_tank_levels(self, tank_levels_path):
@@ -368,35 +368,28 @@ def main(self):
         internal_epynet_step = 1
         simulation_time = 0
 
-        # FOR DEBUG
-        #status = [1.0, 0.0]
-        #actuators_status_dict = {uid: status for uid in self.wn.pumps.uid.append(self.wn.valves.uid)}
-
         while internal_epynet_step > 0:
 
             self.update_actuators()
-            #print("Simulating with actuators: " + str(self.actuator_list))
-            internal_epynet_step, network_state = self.wn.simulate_step(simulation_time, self.actuator_list)
+
+            try:
+                internal_epynet_step, network_state = self.wn.simulate_step(simulation_time, self.actuator_list)
+            except IndexError as i_error:
+                print("ERROR: ", i_error)
+                traceback.print_exc()
+                break
 
             if internal_epynet_step == simluation_step:
                 master_time += 1
 
             print("Internal epynet step: " + str(internal_epynet_step))
             print("ITERATION %d ------------- " % master_time)
 
-            #print("Network State")
-            #print(network_state)
-
             step_results = self.register_results(network_state)
 
-            #print("Step Results")
-            #print(step_results)
-
             self.results_list.append(step_results)
 
             simulation_time = simulation_time + internal_epynet_step
-            #continue
-
 
             try:
                 # Update tank pressure

…hanced_ctown_topology/towns/ctown_pd.inp …/enhanced_ctown_topology/towns/ctown.inpICS_topologies/enhanced_ctown_topology/towns/ctown_pd.inp renamed to ICS_topologies/enhanced_ctown_topology/towns/ctown.inp ICS_topologies/enhanced_ctown_topology/towns/ctown_pd.inp renamed to ICS_topologies/enhanced_ctown_topology/towns/ctown.inp

@@ -1089,42 +1089,6 @@
  11              	40          	10          
 
 [CONTROLS]
-; ----------- Tank 1 ---------------
-;LINK          PU1 OPEN IF   NODE          T1            BELOW          4
-;LINK          PU1 CLOSED IF NODE          T1            ABOVE          6.3
-
-;LINK          PU2 OPEN IF   NODE          T1            BELOW          1
-;LINK          PU2 CLOSED IF NODE          T1            ABOVE          4.5
-
-; ----------- Valve to T2 ---
-;LINK          V2 OPEN IF    NODE          T2            BELOW          .5
-;LINK          V2 CLOSED IF  NODE          T2            ABOVE          5.5
-
-; ----------- T3 ---
-;LINK          PU4 OPEN IF   NODE          T3            BELOW          3
-;LINK          PU4 CLOSED IF NODE          T3            ABOVE          5.3
-
-;LINK          PU5 OPEN IF   NODE          T3            BELOW          1
-;LINK          PU5 CLOSED IF NODE          T3            ABOVE          3.5
-
-; ----------- T4 ---
-;LINK          PU6 OPEN IF   NODE          T4            BELOW          2
-;LINK          PU6 CLOSED IF NODE          T4            ABOVE          3.5
-
-;LINK          PU7 OPEN IF   NODE          T4            BELOW          3
-;LINK          PU7 CLOSED IF NODE          T4            ABOVE          4.5
-
-; ----------- T5 ---
-;LINK          PU8 OPEN IF   NODE          T5            BELOW          1.5
-;LINK          PU8 CLOSED IF NODE          T5            ABOVE          4.5
-
-; ----------- T7 ---
-;LINK          PU10 OPEN IF  NODE          T7            BELOW          2.5
-;LINK          PU10 CLOSED IF              NODE          T7            ABOVE          4.8
-
-;LINK          PU11 OPEN IF  NODE          T7            BELOW          1
-;LINK          PU11 CLOSED IF              NODE          T7            ABOVE          3
-
 
 [RULES]
 
@@ -1221,7 +1185,6 @@
  REQUIRED PRESSURE      20
  PRESSURE EXPONENT      0.5
 
-
 [COORDINATES]
 ;Node            	X-Coord         	Y-Coord
  J511            	-246643.52      	150768.11