Updated traci.simulation.findRoute and traci.trafficlights.getComplet…

…eRedYellowGreenDefinition for TraCI version 20

+traci/+simulation/readStage.m

@@ -4,6 +4,8 @@
 result.read(1);
 stageType = result.readInt();
 result.read(1);
+vType = result.readString();
+result.read(1);
 line = result.readString();
 result.read(1);
 destStop = result.readString();
@@ -14,13 +16,25 @@
 result.read(1);
 cost = result.readDouble();
 result.read(1);
+result.read(1);
+length = result.readDouble();
 intended = result.readString();
 result.read(1);
 depart = result.readDouble();
+result.read(1);
+departPos = result.readDouble();
+result.read(1);
+arrivalPos = result.readDouble();
+result.read(1);
+description = result.readString();
 
-stage = struct('stageType', stageType, 'line', line, 'destStop', destStop);
-stage.edges = edges;
-stage.travelTime = travelTime;
-stage.cost = cost;
-stage.intended = intended;
-stage.depart = depart;
+stage = struct('stageType', stageType, 'vType', vType, 'line', line,...
+    'destStop', destStop, 'edges', edges, 'travelTime', travelTime,...
+    'cost', cost, 'length', length, 'intended', intended, 'depart',...
+    depart, 'departPos', departPos, 'arrivalPos', arrivalPos,...
+    'description', description);
+% stage.edges = edges;
+% stage.travelTime = travelTime;
+% stage.cost = cost;
+% stage.intended = intended;
+% stage.depart = depart;

+traci/+trafficlights/Phase.m

@@ -18,6 +18,7 @@
         minDur
         maxDur
         next
+        name
     end
     methods
         function this = Phase(duration, state, varargin)          
@@ -27,13 +28,17 @@
             this.minDur = -1;
             this.maxDur = -1;
             this.next = -1;
+            this.name = '';
 
             if nargin > 2
                 this.minDur = varargin{1};
                 if nargin > 3
                     this.maxDur = varargin{2};
                     if nargin > 4
                         this.next = varargin{3};
+                        if nargin > 5
+                            this.name = varargin(4);
+                        end
                     end
                 end
             end

+traci/+trafficlights/readLogics.m

@@ -17,13 +17,18 @@
     numPhases = result.readCompound();
     phases = cell(1, numPhases);
     for j=1:numPhases
-        result.readCompound(5);
+        result.readCompound(6);
         duration = result.readTypedDouble();
         state = result.readTypedString();
         minDur = result.readTypedDouble();
         maxDur = result.readTypedDouble();
-        next = result.readTypedInt();
-        phases{j} = traci.trafficlights.Phase(duration, state, minDur, maxDur, next);
+        numNext = result.readCompound();
+        next = zeros(1, numNext);
+        for k = 1:numNext
+            next(k) = resut.readTypedInt();
+        end
+        name = result.readTypedString();
+        phases{j} = traci.trafficlights.Phase(duration, state, minDur, maxDur, next, name);
     end
     logic.phases = phases;
     numParams = result.readCompound();

+traci/connect.m

@@ -44,7 +44,7 @@
         c.connect(host, port);
     break
     catch err        
-        fprintf('Could not connect to TraCI server at %s:%s. %s\n', host, port, err);
+        fprintf('Could not connect to TraCI server at %s:%s. %s\n', host, port, err.message);
         pause(i)
     end
 end