Fix the block-delays bug

vitelot · Nov 6, 2023 · 4ef2215 · 4ef2215
1 parent 945faa1
commit 4ef2215
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/simulation/initialize.jl b/simulation/initialize.jl
@@ -216,13 +216,13 @@ function imposeDelays(FL::Fleet, df::DataFrame)::Nothing
         (train, block, delay) = r;
         train ∈ BLACKLIST && continue;
 
-        o = split(block, "-");
-        if length(o) == 1 || o[1] == o[2] # it's a station
-            block = replace(o[1], r"[ _]+" => "");
-        else
-            # if the block is not a station we have to find to which line it belongs
-            @warn "Delays on blocks other than stations [$block] is not implemented yet.";
-        end 
+        #o = split(block, "-");
+        #if length(o) == 1 || o[1] == o[2] # it's a station
+        #    block = replace(o[1], r"[ _]+" => "");
+        #else
+        #    # if the block is not a station we have to find to which line it belongs
+        #    @warn "Delays on blocks other than stations [$block] is not implemented yet.";
+        #end 
 
         FL.train[train].delay[block] = delay;
 

diff --git a/simulation/simulation.jl b/simulation/simulation.jl
@@ -142,9 +142,11 @@ function simulation(RN::Network, FL::Fleet, sim_id::Int=0)::Bool
 
                     if current_opid == nextopid
                         nextBlockid = current_opid;
+                        naked_nextBlockid = current_opid;
                         nextBlock = ST[nextBlockid]; # it's a station
                     else
                         nextBlockid = current_opid*"-"*nextopid*"-"*line;
+                        naked_nextBlockid = current_opid*"-"*nextopid; # nextBlockid without line
                         # some blocks do not exist on the starting op line and we find one that fits
                         if !haskey(BK, nextBlockid)
                             print_notifications && @info "\tBlock $nextBlockid not found on train $trainid";
@@ -204,7 +206,7 @@ function simulation(RN::Network, FL::Fleet, sim_id::Int=0)::Bool
                                 end
                             end
                         end
-                        delay_imposed = get(train.delay, nextBlockid,0);
+                        delay_imposed = get(train.delay, naked_nextBlockid,0);
 
                         # here we will handle gains
                         # ....