Merging projects part 3

Author: guFalcon

StateMachine/Fluent/Api/FluentImplementation.cs

@@ -34,7 +34,10 @@ namespace StateMachine.Fluent.Api
     public class FluentImplementation<TS, TT, TD> : GlobalTransitionBuilderFluent<TS, TT, TD>,
         TransitionStateFluent<TS, TT, TD>
     {
-        protected FsmModel<TS, TT, TD> FsmModel { get; set; } = new FsmModel<TS, TT, TD>();
+		public Dictionary<Tuple<TS, TS>, List<Timer<TS>>> AfterEntries { get; set; } = new Dictionary<Tuple<TS, TS>, List<Timer<TS>>>();
+		public List<Timer<TS>> GlobalAfterEntries { get; set; } = new List<Timer<TS>>();
+
+		protected FsmModel<TS, TT, TD> FsmModel { get; set; } = new FsmModel<TS, TT, TD>();
         protected TS startState;
 
         protected Tuple<TS> currentState;
@@ -65,8 +68,27 @@ public Fsm<TS, TT, TD> Build()
             FsmModel.Current = FsmModel.States[startState];
             return new Fsm<TS, TT, TD>(FsmModel);
         }
-        
-        public StateFluent<TS, TT, TD> State(TS state)
+
+		public TransitionStateFluent<TS, TT, TD> After(float amount, TimeUnit timeUnit)
+		{
+			var key = currentTransition;
+			if (!AfterEntries.TryGetValue(key, out var l))
+			{
+				l = new List<Timer<TS>>();
+				AfterEntries.Add(key, l);
+			}
+			l.Add(new Timer<TS>(key.Item2, amount, timeUnit));
+			return this;
+		}
+
+		public TransitionStateFluent<TS, TT, TD> AfterGlobal(float amount, TimeUnit timeUnit)
+		{
+			var key = currentGlobalTransition;
+			GlobalAfterEntries.Add(new Timer<TS>(key.Item1, amount, timeUnit));
+			return this;
+		}
+
+		public StateFluent<TS, TT, TD> State(TS state)
         {
             currentState = Tuple.Create(state);
             if (!FsmModel.States.ContainsKey(state))
@@ -98,14 +120,12 @@ public StateFluent<TS, TT, TD> Update(Action<UpdateArgs<TS, TT, TD>> update)
         public GlobalTransitionFluent<TS, TT, TD> GlobalTransitionTo(TS state)
         {
             currentGlobalTransition = Tuple.Create(state);
-            if (!globalTransitionModels.ContainsKey(currentGlobalTransition))
-            {
-                globalTransitionModels[currentGlobalTransition] = new TransitionModel<TS, TT>(startState, state);
-                    new TransitionModel<TS, TT>(startState, state);
-                FsmModel.GlobalTransitions[state] =
-                    new Transition<TS, TT, TD>(globalTransitionModels[currentGlobalTransition]);
-            }
-            return this;
+			if (globalTransitionModels.ContainsKey(currentGlobalTransition)) return this;
+
+			globalTransitionModels[currentGlobalTransition] = new TransitionModel<TS, TT>(startState, state);
+			FsmModel.GlobalTransitions[state] =
+				new Transition<TS, TT, TD>(globalTransitionModels[currentGlobalTransition]);
+			return this;
         }
 
         public GlobalTransitionBuilderFluent<TS, TT, TD> OnGlobal(TT trigger)

StateMachine/Fluent/Api/GlobalTransitionFluent.cs

@@ -45,5 +45,13 @@ public interface GlobalTransitionFluent<TS, TT, TD>
         /// </summary>
         /// <param name="condition">The condition.</param>
         GlobalTransitionBuilderFluent<TS, TT, TD> IfGlobal(Func<IfArgs<TS>, bool> condition);
-    }
+
+		/// <summary>
+		///     Automatically walks the transition you're currently describing, if the specified amount of time has passed.
+		/// </summary>
+		/// <param name="amount">The amount.</param>
+		/// <param name="timeUnit">The time unit.</param>
+		/// <returns></returns>
+		TransitionStateFluent<TS, TT, TD> AfterGlobal(float amount, TimeUnit timeUnit);
+	}
 }

StateMachine/Fluent/Api/TransitionFluent.cs

@@ -32,11 +32,18 @@ namespace StateMachine.Fluent.Api
 {
     public interface TransitionFluent<TS, TT, TD>
     {
-        /// <summary>
-        ///     Specifies the trigger, that has to be served as input in order to walk the transition you're currently describing.
-        /// </summary>
-        /// <param name="trigger">The trigger.</param>
-        TransitionStateFluent<TS, TT, TD> On(TT trigger);
+		/// <summary>
+		///     Automatically walks the transition you're currently describing, if the specified amount of time has passed.
+		/// </summary>
+		/// <param name="amount">The amount.</param>
+		/// <param name="timeUnit">The time unit.</param>
+		/// <returns></returns>
+		TransitionStateFluent<TS, TT, TD> After(float amount, TimeUnit timeUnit);
+		/// <summary>
+		///     Specifies the trigger, that has to be served as input in order to walk the transition you're currently describing.
+		/// </summary>
+		/// <param name="trigger">The trigger.</param>
+		TransitionStateFluent<TS, TT, TD> On(TT trigger);
 
         /// <summary>
         ///     Specifies the condition, that has to be met, in addition to the trigger, to walk the transition you're currently

StateMachine/Fsm.cs

@@ -190,7 +190,7 @@ public void Trigger(TT input)
             }
         }
 
-        public new void Update(TimeSpan elapsedTime)
+        public void Update(TimeSpan elapsedTime)
 		{
 			// After-entries on transitions.
 			foreach (var k in Current.Model.Transitions.Keys)

StateMachine/State.cs

@@ -25,6 +25,7 @@
 // For more information, please refer to <http://unlicense.org>
 // ***************************************************************************
 
+using System;
 using StateMachine.Events;
 
 namespace StateMachine