FG/TG

Moose Development/Moose/Ops/FlightGroup.lua

@@ -58,7 +58,7 @@
 -- @field #table menu F10 radio menu.
 -- @field #string livery Livery.
 -- @field Core.Set#SET_ZONE checkzones Set of zones.
--- @field #table inzones Table of zones in which the group is currently in.
+-- @field Core.Set#SET_ZONE inzones Set of zones in which the group is currently in.
 -- @field #boolean groupinitialized If true, group parameters were initialized.
 -- @extends Core.Fsm#FSM
 
@@ -178,7 +178,7 @@ FLIGHTGROUP = {
   menu               =   nil,
   livery             =   nil,
   checkzones         =   nil,
-  inzones            =    {},
+  inzones            =   nil,
   groupinitialized   =   nil,
 }
 
@@ -338,8 +338,9 @@ FLIGHTGROUP.version="0.2.5"
 --- Create a new FLIGHTGROUP object and start the FSM.
 -- @param #FLIGHTGROUP self
 -- @param #string groupname Name of the group.
+-- @param #string autostart If *true* or *nil* automatically start the FSM. If *false*, use FLIGHTGROUP:Start() manually.
 -- @return #FLIGHTGROUP self
-function FLIGHTGROUP:New(groupname)
+function FLIGHTGROUP:New(groupname, autostart)
 
   -- First check if we already have a flight group for this group.
   local fg=_DATABASE:GetFlightGroup(groupname)
@@ -363,6 +364,9 @@ function FLIGHTGROUP:New(groupname)
   -- Init set of detected units.
   self.detectedunits=SET_UNIT:New()
   
+  -- Init inzone set.
+  self.inzones=SET_ZONE:New()
+  
   -- Defaults
   self:SetFuelLowThreshold()
   self:SetFuelCriticalThreshold()
@@ -484,7 +488,9 @@ function FLIGHTGROUP:New(groupname)
   _DATABASE:AddFlightGroup(self)
 
   -- Autostart.
-  self:Start()
+  if autostart==true or autostart==nil then
+    self:Start()
+  end
 
   return self
 end
@@ -1137,7 +1143,7 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
     text=text..string.format("\n[%d] %s: %s: status=%s, scheduled=%s (%d sec), started=%s, duration=%d", i, taskid, name, status, clock, eta, started, duration)
   end
   if #self.taskqueue>0 then
-    self:T(self.lid..text)
+    self:I(self.lid..text)
   end
 
 
@@ -1195,7 +1201,7 @@ end
 -- @param #string To To state.
 function FLIGHTGROUP:onafterCheckZone(From, Event, To)
 
-  if self.group and self.group:IsAlive() then
+  if self:IsAlive()==true then
     self:_CheckInZones()
   end
 
@@ -1885,11 +1891,6 @@ end
 -- @param #number n Waypoint number.
 function FLIGHTGROUP:onbeforeUpdateRoute(From, Event, To, n)
 
-  if true then
-    return false
-  end
-
-
   -- Is transition allowed? We assume yes until proven otherwise.
   local allowed=true
 
@@ -1966,6 +1967,7 @@ function FLIGHTGROUP:onafterUpdateRoute(From, Event, To, n)
     if self.Debug then
       --self:GetWaypointCoordinate(w):MarkToAll(string.format("UpdateRoute Waypoint %d", i))
     end
+    self:I({i=i, waypoint=w})
     table.insert(wp, w)
   end
   
@@ -2256,7 +2258,7 @@ function FLIGHTGROUP:onafterHold(From, Event, To, airbase, SpeedTo, SpeedHold, S
     Template.route.points=wp
 
     --Respawn the group with new waypoints.
-    self.group=self.group:Respawn(Template)
+    self:Respawn(Template)
         
   end  
     
@@ -2468,7 +2470,7 @@ end
 function FLIGHTGROUP:onafterEnterZone(From, Event, To, Zone)
   local zonename=Zone and Zone:GetName() or "unknown"
   self:I(self.lid..string.format("Entered Zone %s", zonename))
-  self.inzones[zonename]=true
+  self.inzones:Add(Zone:GetName(), Zone)
 end
 
 --- On after "LeaveZone" event. Sets self.inzones[zonename]=false.
@@ -2480,7 +2482,7 @@ end
 function FLIGHTGROUP:onafterLeaveZone(From, Event, To, Zone)
   local zonename=Zone and Zone:GetName() or "unknown"
   self:I(self.lid..string.format("Left Zone %s", zonename))
-  self.inzones[zonename]=false
+  self.inzones:Remove(zonename, true)
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -2995,6 +2997,21 @@ function FLIGHTGROUP:IsUncontrolled()
   return nil
 end
 
+--- Respawn the group
+-- @param #FLIGHTGROUP self
+-- @param #table Template (Optional) The template used for respawning the group.
+-- @return #FLIGHTGROUP self
+function FLIGHTGROUP:Respawn(Template)
+  local Template=Template or self.template
+  
+  if self.group and self.group:InAir() then
+    Template.lateActivation=false
+    self.group=self.group:Respawn(Template)
+  end
+  
+  return self
+end
+
 
 --- Check if task description is unique.
 -- @param #FLIGHTGROUP self
@@ -3210,6 +3227,8 @@ function FLIGHTGROUP:AddWaypointAir(coordinate, wpnumber, speed)
   
   -- Update route.
   self:__UpdateRoute(-1)
+  
+  return self
 end
 
 --- Check if a unit is an element of the flightgroup.
@@ -3511,36 +3530,51 @@ end
 function FLIGHTGROUP:_CheckInZones()
 
   if self.checkzones then
-    --env.info("FF Check in Zones")
+  
+    local Ncheck=self.checkzones:Count()
+    local Ninside=self.inzones:Count()
     
-    for _,_zone in pairs(self.checkzones:GetSet()) do
+    -- Debug info.
-      local zone=_zone --Core.Zone#ZONE
+    self:I(self.lid..string.format("FF Check if flight is in %d zones. Currently it is in %d zones.", self.checkzones:Count(), self.inzones:Count()))
-      
-      for inzonename,isinzone in pairs(self.inzones) do
-      
 
-        if self.group and self.group:IsPartlyOrCompletelyInZone(zone) then
+    -- Firstly, check if group is still inside zone it was already in. If not, remove zones and trigger LeaveZone() event.
+    local leftzones={}
+    for inzonename, inzone in pairs(self.inzones:GetSet()) do
         
-          if isinzone and zone:GetName()==inzonename then
+      -- Check if group is still inside the zone.
-            -- Nothing to do.
+      local isstillinzone=self.group:IsPartlyOrCompletelyInZone(inzone)
-          else
+      
-            -- Group has entered the zone.
+      -- If not, trigger, LeaveZone event.
-            self:EnterZone(zone)
+      if not isstillinzone then
-          end
+        table.insert(leftzones, inzone)
-        
+        --self:LeaveZone(inzone)
-        else
+      end      
-        
+    end
-          if isinzone and zone:GetName()==inzonename then
+    
-            -- Group has left the zone.
+    for _,leftzone in pairs(leftzones) do
-            self:LeaveZone(zone)          
+      self:LeaveZone(leftzone)
-          else
+    end
-            -- Nothing to do.
+    
-          end
+    
-        
+    -- Now, run of all check zones and see if the group entered a  zone.
-        end
+    local enterzones={}
-        
+    for checkzonename,_checkzone in pairs(self.checkzones:GetSet()) do
-      end          
+      local checkzone=_checkzone --Core.Zone#ZONE
-    end  
+      
+      -- Is flight currtently in this check zone?
+      local isincheckzone=self.group:IsPartlyOrCompletelyInZone(checkzone)
+
+      if isincheckzone and not self.inzones:_Find(checkzonename) then
+        table.insert(enterzones, checkzone)
+        --self:__EnterZone(1, checkzone)
+      end
+    end
+    
+    for _,enterzone in pairs(enterzones) do
+      self:EnterZone(enterzone)
+    end
+    
+    
   end
 
 end

Moose Development/Moose/Ops/TankerGroup.lua

@@ -23,6 +23,7 @@
 -- @field #table Qclients Client queue.
 -- @field #TANKERGROUP.Mission currentmission Currently assigned mission.
 -- @field #number missioncounter Counter of total missions.
+-- @field Core.Scheduler#SCHEDULER Statusupdater Scheduler to update tanker status.
 -- @extends Ops.FlightGroup#FLIGHTGROUP
 
 --- *To invent an airplane is nothing. To build one is something. To fly is everything.* -- Otto Lilienthal
@@ -54,6 +55,7 @@ TANKERGROUP = {
   Qclients           =    {},
   currentmission     =   nil,
   missioncounter     =   nil,
+  Statusupdater      =   nil,
 }
 
 --- Tanker mission table.
@@ -97,8 +99,10 @@ _TANKERGROUPS={}
 -- @return #TANKERGROUP self
 function TANKERGROUP:New(groupname)
 
+  local fg=FLIGHTGROUP:New(groupname, false)
+
   -- Inherit everything from TANKERGROUP class.
-  local self=BASE:Inherit(self, FLIGHTGROUP:New(groupname)) -- #TANKERGROUP
+  local self=BASE:Inherit(self, fg) -- #TANKERGROUP
     
   self.missioncounter=0
   
@@ -114,16 +118,22 @@ function TANKERGROUP:New(groupname)
   
   -- Add FSM transitions.
   --                 From State     -->     Event     -->          To State
-  self:AddTransition("*",                 "TankerState",          "*")              -- Tanker is on station and ready to refuel.
+  --self:AddTransition("*",                 "TankerState",          "*")              -- Tanker is on station and ready to refuel.
   self:AddTransition("*",                 "OnStation",            "Ready2Refuel")   -- Tanker is on station and ready to refuel.
   self:AddTransition("*",                 "MissionStart",         "*")              -- Tanker is on station and ready to refuel.  
   
+  
+  -- Scheduler to update the status.
+  self.Statusupdater=SCHEDULER:New(self, TANKERGROUP.TankerState, {self}, 1, 5)
+  
   -- Call status update.
   -- TODO: WARNING, if the call is delayed, it is NOT executed!
-  self:__TankerState(5)
+  --self:__TankerState(5)
   
   --_TANKERGROUPS[groupname]=self
-  table.insert(_TANKERGROUPS, self)
+  --table.insert(_TANKERGROUPS, self)
+  
+  self:Start()
   
   return self
 end
@@ -201,16 +211,14 @@ end
 -- @param #string From From state.
 -- @param #string Event Event.
 -- @param #string To To state.
-function TANKERGROUP:onafterTankerState(From, Event, To)
+function TANKERGROUP:TankerState(From, Event, To)
 
   -- First call flight status.
   --self:GetParent(self).onafterFlightStatus(self, From, Event, To)
 
   -- FSM state.
   local fsmstate=self:GetState()
-  
+
-  self:I(self.lid.."FF Tanker status "..fsmstate)
-  
   -- First check if group is alive?
   if self.group and self.group:IsAlive()==true and not self.currentmission then
   
@@ -232,7 +240,7 @@ function TANKERGROUP:onafterTankerState(From, Event, To)
   self:I(self.lid..text)
   
   -- Nest status update in 30 sec.
-  self:__TankerState(0.5)
+  --self:__TankerState(0.5)
 end
 
 --- On after "MissionStart" event.
@@ -310,6 +318,9 @@ function TANKERGROUP:RouteToMission(mission, delay)
     
     -- Set second coordinate for race track pattern.
     local CoordRaceTrack=Coordinate:Translate(mission.distance, mission.heading, true)
+    
+    Coordinate:MarkToAll("Orbit 1")
+    CoordRaceTrack:MarkToAll("Orbit 2")
   
     -- Add waypoint.
     self:AddWaypointAir(Coordinate, nil, self.speedmax*0.8)
@@ -318,7 +329,7 @@ function TANKERGROUP:RouteToMission(mission, delay)
     local taskorbit=self.group:TaskOrbit(Coordinate, mission.altitude, mission.speed, CoordRaceTrack)
     
     -- Add waypoint task.
-    self:AddTaskWaypoint(taskorbit, 1, "Mission Refuel", 10, mission.duration)
+    self:AddTaskWaypoint(taskorbit, #self.waypoints, "Mission Refuel", 10, mission.duration)
   end
 end