Commit ce1d8225 authored by Kučera Petr RNDr. Ph.D.'s avatar Kučera Petr RNDr. Ph.D.
Browse files

Bug fixes

parent 0eaf10ee
......@@ -11,5 +11,4 @@ set(CMAKE_CXX_FLAGS "-Wall -Wextra -Weffc++ -Wimplicit-fallthrough")
include_directories (${Loco_SOURCE_DIR}/lib)
add_subdirectory (lib)
add_subdirectory (test)
add_subdirectory (bin)
......@@ -8,7 +8,7 @@ default-directory = data
sections = sections.ini
regions = area.ini
traffic-points = trapts.ini
trains = trains.ini
trains = bug/trains.ini
[output]
directory = data/out
......@@ -27,7 +27,7 @@ default-directory = data
# Soubory s dynamickými daty
# directory = data
flags = flags.ini
lists = lists.ini
lists = bug/lists.ini
# PK: Měl by tu být i soubor s postavenými cestami, ale nevím, jak by měl vypadat
[debug]
......
......@@ -571,7 +571,8 @@ Loco::TrainRouteGraph::UpdateActivityWithPred(Activity &act)
else
{
act.mMinStart = min_start;
act.mMaxEnd = std::max(max_end, min_start + act.mMaxDuration);
act.mMaxEnd =
std::max(max_end + act.mMaxDuration, min_start + act.mMaxDuration);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment