First incomplete version

This commit is contained in:
FlightControl
2016-11-30 12:00:32 +01:00
parent 9ab3a2f74d
commit 9c4b147b6b
8 changed files with 222 additions and 198 deletions

View File

@@ -77,7 +77,7 @@ do -- PROCESS_ACCOUNT
--- PROCESS_ACCOUNT class
-- @type PROCESS_ACCOUNT
-- @field Set#SET_UNIT TargetSetUnit
-- @extends Fsm.Process#PROCESS
-- @extends Core.StateMachine#STATEMACHINE_TEMPLATE
PROCESS_ACCOUNT = {
ClassName = "PROCESS_ACCOUNT",
TargetSetUnit = nil,
@@ -87,24 +87,31 @@ do -- PROCESS_ACCOUNT
-- @param #PROCESS_ACCOUNT self
-- @return #PROCESS_ACCOUNT
function PROCESS_ACCOUNT:New()
local FSMT = {
initial = 'Assigned',
events = {
{ name = 'Start', from = 'Assigned', to = 'Waiting' },
{ name = 'Wait', from = '*', to = 'Waiting' },
{ name = 'Report', from = '*', to = 'Report' },
{ name = 'Event', from = '*', to = 'Account' },
{ name = 'More', from = 'Account', to = 'Wait' },
{ name = 'NoMore', from = 'Account', to = 'Accounted' },
{ name = 'Fail', from = '*', to = 'Failed' },
},
endstates = { 'Accounted', 'Failed' }
}
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS:New( FSMT, "PROCESS_ACCOUNT" ) ) -- #PROCESS_ACCOUNT
local self = BASE:Inherit( self, STATEMACHINE_TEMPLATE:New( "PROCESS_ACCOUNT" ) ) -- Core.StateMachine#STATEMACHINE_TEMPLATE
self:AddTransition( "Assigned", "Start", "Waiting")
self:AddTransition( "*", "Wait", "Waiting")
self:AddTransition( "*", "Report", "Report")
self:AddTransition( "*", "Event", "Account")
self:AddTransition( "Account", "More", "Wait")
self:AddTransition( "Account", "NoMore", "Accounted")
self:AddTransition( "*", "Fail", "Failed")
self:AddEndState( "Accounted" )
self:AddEndState( "Failed" )
self:AddStartState( "Assigned" )
return self
end
--- Creates a new DESTROY process.
-- @param #PROCESS_ACCOUNT self
-- @return #PROCESS_ACCOUNT
function PROCESS_ACCOUNT:Init()
self.DisplayInterval = 30
self.DisplayCount = 30
self.DisplayMessage = true
@@ -166,7 +173,7 @@ do -- PROCESS_ACCOUNT_DEADS
--- PROCESS_ACCOUNT_DEADS class
-- @type PROCESS_ACCOUNT_DEADS
-- @field Set#SET_UNIT TargetSetUnit
-- @extends Process#PROCESS
-- @extends #PROCESS_ACCOUNT
PROCESS_ACCOUNT_DEADS = {
ClassName = "PROCESS_ACCOUNT_DEADS",
TargetSetUnit = nil,
@@ -177,8 +184,11 @@ do -- PROCESS_ACCOUNT_DEADS
-- @param #PROCESS_ACCOUNT_DEADS self
-- @param Set#SET_UNIT TargetSetUnit
-- @param #string TaskName
function PROCESS_ACCOUNT_DEADS:Template( TargetSetUnit, TaskName )
return { self, { TargetSetUnit, TaskName } }
function PROCESS_ACCOUNT_DEADS:New( TargetSetUnit, TaskName )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ACCOUNT:New() ) -- #PROCESS_ACCOUNT_DEADS
return self, { TargetSetUnit, TaskName }
end
@@ -187,11 +197,8 @@ do -- PROCESS_ACCOUNT_DEADS
-- @param Set#SET_UNIT TargetSetUnit
-- @param #string TaskName
-- @return #PROCESS_ACCOUNT_DEADS self
function PROCESS_ACCOUNT_DEADS:New( TargetSetUnit, TaskName )
function PROCESS_ACCOUNT_DEADS:Init( TargetSetUnit, TaskName )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ACCOUNT:New() ) -- #PROCESS_ACCOUNT_DEADS
self.TargetSetUnit = TargetSetUnit
self.TaskName = TaskName
@@ -268,4 +275,4 @@ do -- PROCESS_ACCOUNT_DEADS
end
end
end -- PROCESS_ACCOUNT DEADS
end -- PROCESS_ACCOUNT DEADS

View File

@@ -87,7 +87,7 @@ do -- PROCESS_ASSIGN
-- @field Tasking.Task#TASK_BASE Task
-- @field Unit#UNIT ProcessUnit
-- @field Zone#ZONE_BASE TargetZone
-- @extends Fsm.Process#PROCESS
-- @extends Core.StateMachine#STATEMACHINE_TEMPLATE
PROCESS_ASSIGN = {
ClassName = "PROCESS_ASSIGN",
}
@@ -98,21 +98,19 @@ do -- PROCESS_ASSIGN
-- @return #PROCESS_ASSIGN The task acceptance process.
function PROCESS_ASSIGN:New()
local FSMT = {
initial = 'UnAssigned',
events = {
{ name = 'Start', from = 'UnAssigned', to = 'Waiting' },
{ name = 'Assign', from = 'Waiting', to = 'Assigned' },
{ name = 'Reject', from = 'Waiting', to = 'Rejected' },
{ name = 'Fail', from = '*', to = 'Failed' },
},
endstates = {
'Assigned', 'Rejected', 'Failed'
},
}
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS:New( FSMT, "PROCESS_ASSIGN" ) ) -- #PROCESS_ASSIGN
local self = BASE:Inherit( self, STATEMACHINE_TEMPLATE:New( "PROCESS_ASSIGN" ) ) -- Core.StateMachine#STATEMACHINE_TEMPLATE
self:AddTransition( "UnAssigned", "Start", "Waiting" )
self:AddTransition( "Waiting", "Assign", "Assigned" )
self:AddTransition( "Waiting", "Reject", "Rejected" )
self:AddTransition( "*", "Fail", "Failed" )
self:AddEndState( "Assigned" )
self:AddEndState( "Rejected" )
self:AddEndState( "Failed" )
self:AddStartState( "UnAssigned" )
return self
end
@@ -137,8 +135,11 @@ do -- PROCESS_ASSIGN_ACCEPT
--- Creates a new task assignment state machine. The process will accept the task by default, no player intervention accepted.
-- @param #PROCESS_ASSIGN_ACCEPT self
-- @param #string TaskBriefing
function PROCESS_ASSIGN_ACCEPT:Template( TaskBriefing )
return { self, { TaskBriefing } }
function PROCESS_ASSIGN_ACCEPT:New( TaskBriefing )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_ACCEPT
return self, { TaskBriefing }
end
@@ -146,10 +147,8 @@ do -- PROCESS_ASSIGN_ACCEPT
-- @param #PROCESS_ASSIGN_ACCEPT self
-- @param #string TaskBriefing
-- @return #PROCESS_ASSIGN_ACCEPT The task acceptance process.
function PROCESS_ASSIGN_ACCEPT:New( TaskBriefing )
function PROCESS_ASSIGN_ACCEPT:Init( TaskBriefing )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_ACCEPT
self.TaskBriefing = TaskBriefing
@@ -208,9 +207,12 @@ do -- PROCESS_ASSIGN_MENU_ACCEPT
-- @param #string TaskName
-- @param #string TaskBriefing
-- @return #PROCESS_ASSIGN_MENU_ACCEPT self
function PROCESS_ASSIGN_MENU_ACCEPT:Template( TaskName, TaskBriefing )
function PROCESS_ASSIGN_MENU_ACCEPT:New( TaskName, TaskBriefing )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_MENU_ACCEPT
return { self, { TaskName, TaskBriefing } }
return self, { TaskName, TaskBriefing }
end
@@ -219,11 +221,8 @@ do -- PROCESS_ASSIGN_MENU_ACCEPT
-- @param #string TaskName
-- @param #string TaskBriefing
-- @return #PROCESS_ASSIGN_MENU_ACCEPT self
function PROCESS_ASSIGN_MENU_ACCEPT:New( TaskName, TaskBriefing )
function PROCESS_ASSIGN_MENU_ACCEPT:Init( TaskName, TaskBriefing )
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS_ASSIGN:New() ) -- #PROCESS_ASSIGN_MENU_ACCEPT
self.TaskBriefing = TaskBriefing
self.TaskName = TaskName

View File

@@ -82,7 +82,7 @@ do -- PROCESS_ROUTE
-- @field Task#TASK TASK
-- @field Unit#UNIT ProcessUnit
-- @field Zone#ZONE_BASE TargetZone
-- @extends Fsm.Process#PROCESS
-- @extends Core.StateMachine#STATEMACHINE_TEMPLATE
PROCESS_ROUTE = {
ClassName = "PROCESS_ROUTE",
}
@@ -92,28 +92,31 @@ do -- PROCESS_ROUTE
-- @param #PROCESS_ROUTE self
-- @return #PROCESS_ROUTE self
function PROCESS_ROUTE:New()
local FSMT = {
initial = 'None',
events = {
{ name = 'Start', from = 'None', to = 'Routing' },
{ name = 'Report', from = '*', to = 'Reporting' },
{ name = 'Route', from = '*', to = 'Routing' },
{ name = 'Pause', from = 'Routing', to = 'Pausing' },
{ name = 'Abort', from = '*', to = 'Aborted' },
{ name = 'Arrive', from = 'Routing', to = 'Arrived' },
{ name = 'Success', from = 'Arrived', to = 'Success' },
{ name = 'Fail', from = '*', to = 'Failed' },
},
endstates = {
'Arrived', 'Failed'
},
}
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS:New( FSMT, "PROCESS_ROUTE" ) ) -- #PROCESS_ROUTE
local self = BASE:Inherit( self, STATEMACHINE_TEMPLATE:New( "PROCESS_ROUTE" ) ) -- Core.StateMachine#STATEMACHINE_TEMPLATE
self:AddTransition( "None", "Start", "Routing" )
self:AddTransition( "*", "Report", "Reporting" )
self:AddTransition( "*", "Route", "Routing" )
self:AddTransition( "Routing", "Pause", "Pausing" )
self:AddTransition( "*", "Abort", "Aborted" )
self:AddTransition( "Routing", "Arrive", "Arrived" )
self:AddTransition( "Arrived", "Success", "Success" )
self:AddTransition( "*", "Fail", "Failed" )
self:AddTransition( "", "", "" )
self:AddTransition( "", "", "" )
self:AddEndState( "Arrived" )
self:AddEndState( "Failed" )
self:AddStartState( "None" )
return self
end
function PROCESS_ROUTE:Init()
self.DisplayInterval = 30
self.DisplayCount = 30
self.DisplayMessage = true
@@ -190,7 +193,7 @@ do -- PROCESS_ROUTE_ZONE
-- @field Task#TASK TASK
-- @field Unit#UNIT ProcessUnit
-- @field Zone#ZONE_BASE TargetZone
-- @extends Process.Route#PROCESS_ROUTE
-- @extends #PROCESS_ROUTE
PROCESS_ROUTE_ZONE = {
ClassName = "PROCESS_ROUTE_ZONE",
}
@@ -199,8 +202,10 @@ do -- PROCESS_ROUTE_ZONE
--- Creates a new routing state machine. The task will route a controllable to a ZONE until the controllable is within that ZONE.
-- @param #PROCESS_ROUTE_ZONE self
-- @param Zone#ZONE_BASE TargetZone
function PROCESS_ROUTE_ZONE:Template( TargetZone )
return { self, { TargetZone } }
function PROCESS_ROUTE_ZONE:New( TargetZone )
local self = BASE:Inherit( self, PROCESS_ROUTE:New() ) -- #PROCESS_ROUTE_ZONE
return self, { TargetZone }
end
@@ -210,8 +215,6 @@ do -- PROCESS_ROUTE_ZONE
-- @return #PROCESS_ROUTE_ZONE self
function PROCESS_ROUTE_ZONE:New( TargetZone )
local self = BASE:Inherit( self, PROCESS_ROUTE:New() ) -- #PROCESS_ROUTE_ZONE
self.TargetZone = TargetZone
return self

View File

@@ -70,7 +70,7 @@ do -- PROCESS_SMOKE
--- PROCESS_SMOKE class
-- @type PROCESS_SMOKE
-- @extends Fsm.Process#PROCESS
-- @extends Core.StateMachine#STATEMACHINE_TEMPLATE
PROCESS_SMOKE = {
ClassName = "PROCESS_SMOKE",
}
@@ -79,26 +79,21 @@ do -- PROCESS_SMOKE
-- @param #PROCESS_SMOKE self
-- @return #PROCESS_SMOKE
function PROCESS_SMOKE:New()
local FSMT = {
initial = 'None',
events = {
{ name = 'Start', from = 'None', to = 'AwaitSmoke' },
{ name = 'Next', from = 'AwaitSmoke', to = 'Smoking' },
{ name = 'Next', from = 'Smoking', to = 'AwaitSmoke' },
{ name = 'Stop', from = '*', to = 'Success' },
{ name = 'Fail', from = 'Smoking', to = 'Failed' },
{ name = 'Fail', from = 'AwaitSmoke', to = 'Failed' },
{ name = 'Fail', from = 'None', to = 'Failed' },
},
endstates = {
'Failed', 'Success'
},
}
-- Inherits from BASE
local self = BASE:Inherit( self, PROCESS:New( FSMT, "PROCESS_SMOKE" ) ) -- #PROCESS_SMOKE
local self = BASE:Inherit( self, STATEMACHINE_TEMPLATE:New( "PROCESS_SMOKE" ) ) -- Core.StateMachine#STATEMACHINE_TEMPLATE
self:AddTransition( "None", "Start", "AwaitSmoke" )
self:AddTransition( "AwaitSmoke", "Next", "Smoking" )
self:AddTransition( "Smoking", "Next", "AwaitSmoke" )
self:AddTransition( "*", "Stop", "Success" )
self:AddTransition( "*", "Fail", "Failed" )
self:AddEndState( "Failed" )
self:AddEndState( "Success" )
self:AddStartState( "None" )
return self
end
@@ -155,8 +150,10 @@ do -- PROCESS_SMOKE_TARGETS_ZONE
-- @param #PROCESS_SMOKE_TARGETS_ZONE self
-- @param Set#SET_UNIT TargetSetUnit
-- @param Zone#ZONE_BASE TargetZone
function PROCESS_SMOKE_TARGETS_ZONE:Template( TargetSetUnit, TargetZone )
return { self, { TargetSetUnit, TargetZone } }
function PROCESS_SMOKE_TARGETS_ZONE:New( TargetSetUnit, TargetZone )
local self = BASE:Inherit( self, PROCESS_SMOKE:New() ) -- #PROCESS_SMOKE
return self, { TargetSetUnit, TargetZone }
end
--- Creates a new target smoking state machine. The process will request from the menu if it accepts the task, if not, the unit is removed from the simulator.
@@ -164,9 +161,7 @@ do -- PROCESS_SMOKE_TARGETS_ZONE
-- @param Set#SET_UNIT TargetSetUnit
-- @param Zone#ZONE_BASE TargetZone
-- @return #PROCESS_SMOKE_TARGETS_ZONE self
function PROCESS_SMOKE_TARGETS_ZONE:New( TargetSetUnit, TargetZone )
local self = BASE:Inherit( self, PROCESS_SMOKE:New() ) -- #PROCESS_SMOKE
function PROCESS_SMOKE_TARGETS_ZONE:Init( TargetSetUnit, TargetZone )
self.TargetSetUnit = TargetSetUnit
self.TargetZone = TargetZone