Streamline cybernodes and add cyberlink sections in EpanetCPA class

Author: rtaormina

epanetCPA/EpanetCPA.m

@@ -161,7 +161,7 @@
                     % TO DO: should IDEALLY raise error if first line doesn't start with ; (header)                
 
                     if size(section_text,1) == 1
-                        % EXIT< no cybernodes has been defined
+                        % EXIT< no cybernodes have been defined
                         error('ERROR: no cybernodes defined in %s. Did you include the header for this section?', cpaFile)
                     end
 
@@ -196,28 +196,13 @@
                                     temp(nsep+1:3) = length(section_text{j});
                                 end
 
-                                % get sensors...
-                                sensors = strtrim(section_text{j}(temp(1):temp(2)));
-                                
-                                if ~isempty(sensors)
-                                    sensors = regexp(sensors,',','split');
-                                end
-                                
-                                for k = 1 : numel(sensors)
-                                    thisNode.sensors(k) = strtrim(sensors(k));
-                                end
+                                % get sensors...                                
+                                sensors = section_text{j}(temp(1):temp(2));
+                                thisNode.sensors = strsplit(sensors(~isspace(sensors)),',');
 
                                 % ... actuators...
-                                if temp(2) ~= length(section_text{j})
-                                    actuators = strtrim(section_text{j}(temp(2):end));
-                                    if ~isempty(actuators)
-                                        actuators = regexp(actuators,',','split');
-                                    end        
-                                    
-                                    for k = 1 : numel(actuators)
-                                        thisNode.actuators(k) = strtrim(actuators(k));
-                                    end
-                                end
+                                actuators = section_text{j}(temp(2):end);
+                                thisNode.actuators = strsplit(actuators(~isspace(actuators)),',');
 
                                 % concatenate
                                 cybernodes = cat(1,cybernodes,thisNode);
@@ -226,7 +211,40 @@
                     end
 
                 case 'CYBERLINKS'            
-                    warning('THIS WILL BE REMOVED!')
+                    
+                    if size(section_text,1) == 1
+                        % EXIT< no cyberlinks have been defined
+                        error('ERROR: no cyberlinks defined in %s. Did you include the header for this section?', cpaFile)
+                    end
+                    
+                    % initialize array of cyberlinks
+                    cyberlinks = [];
+                    % loop through all cybernodes
+                    for j = 2 : size(section_text,1)
+
+                        % check if comment first...
+                        temp = strtrim(section_text{j});
+                        if temp(1)~= ';'
+                            % get \t separator positions
+                            temp = regexp(section_text{j},'\t');
+                            nsep = numel(temp);                            
+                            if isempty(temp)
+                                error('Cyberlink string %d in %s file has no details.', j-1, self.cpaFile);
+                            elseif nsep > 2                                
+                                error('Problem with format of cyberlink string %d in %s file. Check README.md',...
+                                    j-1, self.cpaFile);                                                            
+                            else
+
+                                % initialize cybernode struct
+                                thisLink.sender = strtrim(section_text{j}(1:temp(1)));
+                                thisLink.receiver = strtrim(section_text{j}(temp(1):temp(2)));
+                                thisLink.signals  = strsplit(strtrim(section_text{j}(temp(2):end)),',');
+                                
+                                % concatenate
+                                cyberlinks = cat(1,cyberlinks,thisLink);
+                            end
+                        end                        
+                    end
 
                 case 'CYBERATTACKS'            
                     % TO DO: should IDEALLY raise error if first line doesn't start with ; (header)                

plot_results.ipynb

@@ -1,20 +1,22 @@
 [CYBERNODES]
 ; Name Sensors Actuators
- PLC1		PU1, PU2, PU3
+ PLC1		PU1, PU2
  PLC2	T1
- PLC3	T2	PU4, PU5, PU6, PU7, V2
- PLC4	T3
- PLC5		PU8, PU9, PU10, PU11
- PLC6	T4
- PLC7	T5
- PLC8	T6
- PLC9	T7
 ; SCADA
 
+[CYBERLINKS]
+; Source Destination Variables
+ PLC1	SCADA	F_PU1, F_PU2, P_J269, P_J280
+ PLC2	SCADA	P_T1
+ PLC2	PLC1	P_T1
+
 [CYBERATTACKS]
 ; Type	Target	Init_cond	End_cond	Arguments
+; Denial-of-service of the connection link between PLC2 and PLC1. PLC1 fails to receive updated readings water level data for tank T1 and keeps the pumps (PU1,PU2) ON. This causes a surge in the tank T1.
+
 
 [CYBEROPTIONS]
 verbosity	1
-initial_conditions	4,3.75,3.25,3.75,3.5,3.5,3
+what_to_store	T1, PU1, PU2, J269, J280	PRESSURE	FLOW
+initial_conditions	4
 patterns_file	./minitown_patterns.csv