Merge branch 'master' into dev-paper

Author: afmurillo

dhalsim/parser/antlr/controlsLexer.py

@@ -114,6 +114,7 @@ class controlsLexer(Lexer):
     COMMENT = 19
     NEWLINES = 20
     WS = 21
+    #PUMP_SETTING = 22
 
     channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ]
 

dhalsim/parser/antlr/controlsParser.py

@@ -74,6 +74,7 @@ class controlsParser ( Parser ):
     COMMENT=19
     NEWLINES=20
     WS=21
+    #PUMP_SETTING=22
 
     def __init__(self, input:TokenStream, output:TextIO = sys.stdout):
         super().__init__(input, output)

dhalsim/parser/grammars/controls.g4

@@ -9,28 +9,16 @@ ANY_SPACE           :   ' '+;
 STATE               :   (OPEN | CLOSED | VALUE) ;
 OPEN                :   'OPEN';
 CLOSED              :   'CLOSED';
-//PUMP_SETTING        :   [0-9]*'.'[0-9]*;
+
 
 /** Conditions */
 CONDITION           :   (BELOW | ABOVE) ;
 BELOW               :   'BELOW';
 ABOVE               :   'ABOVE';
 
 /** Values */
+VALUE               : [0-9]*'.'*[0-9]+;               
 
-//  5.0             :   [0-9]+'.'[0-9]+
-//  5               :   [0-9]+
-//  .5              :   '.'[0-9]+
-/*
-VALUE               :   (INT | FLOAT | DEC );
-FLOAT               :   [0-9]+'.'[0-9]+ ;
-INT                 :   [0-9]+ ;
-DEC                 :   '.'[0-9]+ ;
-*/
-
-VALUE               : [0-9]*'.'*[0-9]+;                // 5 valid, but 5.0 not!
-
-//VALUE               :   [0-9]*'.'*[0-9]+ ;
 ID                  :   [a-zA-Z0-9_]+ ;
 CAPITALS            :   [A-Z].*? ;
 

dhalsim/parser/input_parser.py

@@ -129,7 +129,7 @@ def generate_controls(self):
                 # This is an AT NODE control
                 dependant = str(child.getChild(10))
                 value = float(str(child.getChild(14)))
-
+                
                 controls.append({
                     "type": str(child.getChild(12)).lower(),
                     "dependant": dependant,

dhalsim/physical_process.py

@@ -290,7 +290,7 @@ def build_initial_actuator_dict(self):
                 self.logger.error('Invalid actuator!')
 
         self.actuator_list = dict(zip(actuator_names, actuator_status))
-
+        
     def register_initial_results(self):
         self.values_list = [self.master_time, datetime.now()]
 
@@ -338,6 +338,7 @@ def register_initial_results(self):
 
         self.extend_attacks()
 
+
     def register_results(self, results=None):
 
         # Results are divided into: nodes: reservoir and tanks, links: flows and status
@@ -534,7 +535,6 @@ def get_attack_flag(self, name):
         return flag
 
     def get_actuator_status(self, actuator):
-        #self.logger.debug('Pump value: '+ str(self.get_from_db(actuator)))
         if isinstance(self.get_from_db(actuator), int):
             # Actuator is either OPEN/CLOSED
             return int(self.get_from_db(actuator))
@@ -916,4 +916,4 @@ def is_valid_file(test_parser, arg):
     args = parser.parse_args()
 
     simulation = PhysicalPlant(Path(args.intermediate_yaml))
-    simulation.main()
+    simulation.main()

examples/anytown_topology/anytown_config.yaml

@@ -8,4 +8,4 @@ simulator: epynet
 demand: pdd
 log_level: debug
 demand_patterns: demands_anytown_small.csv
-#attacks: !include anytown_concealment_mitm.yaml
+#attacks: !include anytown_concealment_mitm.yaml