FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

xxx

Browse Source
This commit is contained in:
Applevangelist 2024-05-20 11:15:47 +02:00
parent 593f21bd3b
commit dd7c1a9245
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Moose Development/Moose/Functional/Stratego.lua
View File

@ -181,7 +181,7 @@ STRATEGO = {
debug = false, debug = false,
drawzone = false, drawzone = false,
markzone = false, markzone = false,
version = "0.2.10", version = "0.2.11",
portweight = 3, portweight = 3,
POIweight = 1, POIweight = 1,
maxrunways = 3, maxrunways = 3,
@ -1276,10 +1276,11 @@ end
-- @param #boolean Draw If true, draw the route on the map. -- @param #boolean Draw If true, draw the route on the map.
-- @param #table Color (Optional) RGB color table {r, g, b}, e.g. {1,0,0} for red. Defaults to black. -- @param #table Color (Optional) RGB color table {r, g, b}, e.g. {1,0,0} for red. Defaults to black.
-- @param #number LineType (Optional) Line type: 0=No line, 1=Solid, 2=Dashed, 3=Dotted, 4=Dot dash, 5=Long dash, 6=Two dash. Default 6. -- @param #number LineType (Optional) Line type: 0=No line, 1=Solid, 2=Dashed, 3=Dotted, 4=Dot dash, 5=Long dash, 6=Two dash. Default 6.
-- @param #boolean NoOptimize If set to true, do not optimize (shorten) the resulting route if possible.
-- @return #table Route Table of #string name entries of the route -- @return #table Route Table of #string name entries of the route
-- @return #boolean Complete If true, the route was found end-to-end. -- @return #boolean Complete If true, the route was found end-to-end.
-- @return #boolean Reverse If true, the route was found with a reverse search, the route table will be from sorted from end point to start point. -- @return #boolean Reverse If true, the route was found with a reverse search, the route table will be from sorted from end point to start point.
function STRATEGO:FindRoute(Start,End,Hops,Draw,Color,LineType) function STRATEGO:FindRoute(Start,End,Hops,Draw,Color,LineType,NoOptimize)
self:T(self.lid.."FindRoute") self:T(self.lid.."FindRoute")
--self:I({Start,End,Hops}) --self:I({Start,End,Hops})
--local bases = UTILS.DeepCopy(self.airbasetable) --local bases = UTILS.DeepCopy(self.airbasetable)
@ -1376,7 +1377,7 @@ function STRATEGO:FindRoute(Start,End,Hops,Draw,Color,LineType)
return Route, foundcut return Route, foundcut
end end
if routecomplete == true then if routecomplete == true and NoOptimize ~= true then
local foundcut = true local foundcut = true
while foundcut ~= false do while foundcut ~= false do
Route, foundcut = OptimizeRoute(Route) Route, foundcut = OptimizeRoute(Route)