Merge branch 'master' of https://github.com/UnterrainerInformatik/FiniteStateMachine

Author: guFalcon

MonoGameStateMachine/MonoGameStateMachine.csproj

@@ -100,6 +100,9 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

StateMachine/Fluent/Api/FluentImplementation.cs

@@ -44,11 +44,11 @@ public class FluentImplementation<TS, TT, TD> : GlobalTransitionBuilderFluent<TS
         protected Dictionary<Tuple<TS>, StateModel<TS, TT, TD>> stateModels =
             new Dictionary<Tuple<TS>, StateModel<TS, TT, TD>>();
 
-        protected Dictionary<Tuple<TS, TS>, TransitionModel<TS, TT, TD>> transitionModels =
-            new Dictionary<Tuple<TS, TS>, TransitionModel<TS, TT, TD>>();
+        protected Dictionary<Tuple<TS, TS>, TransitionModel<TS, TT>> transitionModels =
+            new Dictionary<Tuple<TS, TS>, TransitionModel<TS, TT>>();
 
-        protected Dictionary<Tuple<TS>, TransitionModel<TS, TT, TD>> globalTransitionModels =
-            new Dictionary<Tuple<TS>, TransitionModel<TS, TT, TD>>();
+        protected Dictionary<Tuple<TS>, TransitionModel<TS, TT>> globalTransitionModels =
+            new Dictionary<Tuple<TS>, TransitionModel<TS, TT>>();
 
         public FluentImplementation(TS startState)
         {
@@ -63,8 +63,7 @@ public Fsm<TS, TT, TD> Build()
             }
 
             FsmModel.Current = FsmModel.States[startState];
-            Fsm<TS, TT, TD> fsm = new Fsm<TS, TT, TD>(FsmModel);
-            return fsm;
+            return new Fsm<TS, TT, TD>(FsmModel);
         }
 
         public StateFluent<TS, TT, TD> State(TS state)
@@ -101,8 +100,8 @@ public GlobalTransitionFluent<TS, TT, TD> GlobalTransitionTo(TS state)
             currentGlobalTransition = Tuple.Create(state);
             if (!globalTransitionModels.ContainsKey(currentGlobalTransition))
             {
-                globalTransitionModels[currentGlobalTransition] =
-                    new TransitionModel<TS, TT, TD>(startState, state);
+                globalTransitionModels[currentGlobalTransition] = new TransitionModel<TS, TT>(startState, state);
+                    new TransitionModel<TS, TT>(startState, state);
                 FsmModel.GlobalTransitions[state] =
                     new Transition<TS, TT, TD>(globalTransitionModels[currentGlobalTransition]);
             }
@@ -127,7 +126,7 @@ public TransitionFluent<TS, TT, TD> TransitionTo(TS state)
             currentTransition = Tuple.Create(currentState.Item1, state);
             if (!transitionModels.ContainsKey(currentTransition))
             {
-                transitionModels[currentTransition] = new TransitionModel<TS, TT, TD>(currentState.Item1,
+                transitionModels[currentTransition] = new TransitionModel<TS, TT>(currentState.Item1,
                     state);
                 stateModels[currentState].Transitions[state] =
                     new Transition<TS, TT, TD>(transitionModels[currentTransition]);

StateMachine/NUnitTests/FluentTests.cs

@@ -129,7 +129,7 @@ public void WhenStateChangesOnEnterAndOnExitHooksShouldTrigger()
             Assert.That(button.OldState, Is.EqualTo(State.REFRESHING));
 
             // Update was triggered twice over all states.
-            Assert.That(button.UpdateCounter, Is.EqualTo(2F));
+            Assert.That(button.UpdateCounter, Is.EqualTo(2));
         }
     }
 }

StateMachine/StateMachine.csproj

@@ -75,6 +75,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

StateMachine/Transition.cs

@@ -35,7 +35,7 @@ namespace StateMachine
     [PublicAPI]
     public class Transition<TS, TT, TD>
     {
-        private TransitionModel<TS, TT, TD> Model { get; set; }
+        private TransitionModel<TS, TT> Model { get; set; }
 
         public TS Target => Model.Target;
 
@@ -47,7 +47,7 @@ public TS Source
             set { Model.Source = value; }
         }
 
-        public Transition(TransitionModel<TS, TT, TD> model)
+        public Transition(TransitionModel<TS, TT> model)
         {
             Model = model;
         }
@@ -57,7 +57,7 @@ public Transition(Collection<TT> triggers, TS source, TS target)
         {
             if (target == null) throw FsmBuilderException.TargetStateCannotBeNull();
 
-            Model = new TransitionModel<TS, TT, TD>(source, target);
+            Model = new TransitionModel<TS, TT>(source, target);
             Model.Triggers.UnionWith(triggers);
         }
 

StateMachine/TransitionModel.cs

@@ -33,7 +33,7 @@
 namespace StateMachine
 {
     [PublicAPI]
-    public class TransitionModel<TS, TT, TD>
+    public class TransitionModel<TS, TT>
     {
         public ISet<TT> Triggers { get; set; } = new HashSet<TT>();
         public TS Source { get; set; }