merge

Author: RomanSoloweow

CodeMap1.dgml

@@ -6,10 +6,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
-    <PackageReference Include="SimpleStateMachineLibrary" Version="1.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.4" />
+    <PackageReference Include="SimpleStateMachineLibrary" Version="2.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="SimpleStateMachineLibrary">
+      <HintPath>..\SimpleStateMachineLibrary\bin\Release\netstandard2.1\SimpleStateMachineLibrary.dll</HintPath>
+    </Reference>
   </ItemGroup>
 
 </Project>

Examples/Examples.csproj

@@ -1,5 +1,12 @@
 # SimpleStateMachineLibrary [![NuGet Pre Release](https://img.shields.io/nuget/vpre/SimpleStateMachineLibrary.svg)](https://www.nuget.org/packages/SimpleStateMachineLibrary) 
 A C# library for realization simple state-machine on .Net
+# Why SimpleStateMachine?
+ Create state machine in **two steps** :
+1. Create scheme in  [node editor](https://github.com/SimpleStateMachine/SimpleStateMachineNodeEditor) ♦️
+2. Load scheme in your project using [library](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary)📑
+ 
+ Just describe your app logic and run the state machine🚀
+ 
 ## Give a Star! :star:
 If you like or are using this project please give it a star. Thanks!
 ## Сontent
@@ -86,24 +93,28 @@ Useful extensions for work:
 ```
 ## Documentation
 * StateMachine
+    * [Create](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/StateMachine#Create)
     * [Import](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/StateMachine#Import)
     * [Export](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/StateMachine#Export)
     * [Logging](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/StateMachine#Logging)
 * State
     * [Create](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Create)
     * [Get](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Get)
+    * [Exists](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Exists)
     * [Delete](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Delete)
     * [Entry](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Entry)
     * [Exit](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/State#Exit)
 * Transition
     * [Create](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Create)
     * [Get](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Get)
+    * [Exists](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Exists)
     * [Delete](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Delete)
     * [Invoke](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Invoke)
     * [Parameters](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Transition#Parameters)
 * Data
     * [Create](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Data#Create)
     * [Get](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Data#Get)
+    * [Exists](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Data#Exists)
     * [Delete](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Data#Delete)
     * [Change](https://github.com/SimpleStateMachine/SimpleStateMachineLibrary/wiki/Data#Change)
 ## License

README.md

@@ -1,27 +1,30 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>SimpleStateMachine</Authors>
     <RepositoryUrl>https://github.com/SimpleStateMachine/SimpleStateMachineLibrary</RepositoryUrl>
     <PackageLicenseFile></PackageLicenseFile>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageTags>statemachine state-machine finite-state-machine</PackageTags>
     <PackageProjectUrl>https://github.com/SimpleStateMachine/SimpleStateMachineLibrary</PackageProjectUrl>
-    <Version>1.0.1.</Version>
+    <Version>2.0.1.0</Version>
     <Description>Library for SimpleStateMachine</Description>
-    <PackageIcon>logo.jpg</PackageIcon>
-    <AssemblyVersion>1.0.1.0</AssemblyVersion>
-    <FileVersion>1.0.1.0</FileVersion>
+    <PackageIcon>SimpleStateMachine.png</PackageIcon>
+    <AssemblyVersion>2.0.1.0</AssemblyVersion>
+    <FileVersion>2.0.1.0</FileVersion>
+    <PackageReleaseNotes>Add methods for check on exists
+Update package: Microsoft.Extensions.Logging.Abstractions
+Some fix</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="logo.jpg">
+    <None Include="SimpleStateMachine.png">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>

SimpleStateMachineLibrary/SimpleStateMachine.png

@@ -158,16 +158,21 @@ private StateMachine ChangeState()
             return this;
         }
 
-        public void Start(Dictionary<string, object> startParameters = null)
-        {        
-            if(StartState==null)
+        private void CheckStartState()
+        {
+            if (StartState == null)
             {
                 string message = "Start state not set";
                 var exception = new NullReferenceException(message: message);
                 _logger?.LogError(exception, message);
                 throw exception;
-                
+
             }
+        }
+
+        public void Start(Dictionary<string, object> startParameters = null)
+        {
+            CheckStartState();
 
             _logger?.LogDebugAndInformation("Start work state machine");
 

SimpleStateMachineLibrary/SimpleStateMachineLibrary.csproj

@@ -31,7 +31,10 @@ internal Data _GetData(string nameData, out bool result, bool exception)
 
         //    return data_;
         //}
-
+        public bool DataExists(string nameData)
+        {
+            return Check.Contains(_data, nameData, this._logger, false);
+        }
 
         public Data GetData(string nameData)
         {

SimpleStateMachineLibrary/StateMachines/StateMachine.cs

@@ -33,7 +33,10 @@ internal State _GetState(string nameState, out bool result, bool exception)
 
         //    return _state;
         //}
-
+        public bool StateExists(string nameState)
+        {
+            return Check.Contains(_states, nameState, this._logger, false);
+        }
 
         public State GetState(string nameState)
         {

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithData.cs

@@ -33,11 +33,15 @@ internal Transition _GetTransition(string nameTransition, out bool result, bool
             return _transition;
         }
 
+        public bool TransitionExists(string nameTransition)
+        {
+            return Check.Contains(_transitions, nameTransition, this._logger, false);
+        }
 
         public Transition GetTransition(string nameTransition)
         {
             return _GetTransition(nameTransition, out bool result, true);
-        }        
+        }
 
         public Transition TryGetTransition(string nameTransition, out bool result)
         {
@@ -52,6 +56,8 @@ public Transition TryGetTransition(string nameTransition, out bool result)
 
 
 
+
+
         internal Transition _AddTransition(string nameTransition, State stateFrom, State stateTo, Action<Transition, Dictionary<string, object>> actionOnInvoke, out bool result, bool exception)
         {
             //throw that element already contains 

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithStates.cs

@@ -26,7 +26,6 @@ private Dictionary<string, Transition> GetTransitionsFromState(State state, out
             return transitionsFromState;
         }
 
-
         public Dictionary<string, Transition> GetTransitionsFromState(string stateName)
         {
             return GetTransitionsFromState(stateName, out bool result,  true);
@@ -67,7 +66,6 @@ private Dictionary<string, Transition> GetTransitionsToState(State state, out bo
             return transitionsToState;
         }
 
-
         public Dictionary<string, Transition> GetTransitionsToState(string stateName)
         {
             return GetTransitionsToState(stateName, out bool result, true);

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitions.cs

@@ -38,7 +38,7 @@ private static XDocument ToXDocument(StateMachine stateMachine, string nameFile)
                 transitions.Add(transition.Value.ToXElement());
             }
 
-            XElement datas = new XElement("Data");
+            XElement datas = new XElement("DATA");
             stateMachineXElement.Add(datas);
 
             foreach (var data in stateMachine._data)
@@ -70,7 +70,7 @@ private static StateMachine FromXDocument(StateMachine stateMachine, XDocument x
             var Transitions = stateMachineXElement.Element("Transitions")?.Elements()?.ToList();
             Transitions?.ForEach(x => stateMachine.AddTransition(x));
 
-            var Datas = stateMachineXElement.Element("Data")?.Elements()?.ToList();
+            var Datas = stateMachineXElement.Element("DATA")?.Elements()?.ToList();
             Datas?.ForEach(x => stateMachine.AddData(x));
             stateMachine?._logger?.LogDebug("StateMachine from XDocument");
             return stateMachine;

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitionsForState.cs

@@ -49,16 +49,15 @@ public void StateMachineFromCode()
             State state3 = stateMachine.AddState("State3");
             State state4 = stateMachine.AddState("State4");
 
-            state1.Delete();
-            state1.TryDelete(out bool result);
+            Assert.IsTrue(stateMachine.StateExists("State1"));
 
             stateMachine.OnChangeState(ActionOnChangeState);
 
             Transition transition1 = state1.AddTransitionFromThis("Transition1", state2);
             Transition transition2 = stateMachine.AddTransition("Transition2", state2, state3);
             Transition transition3 = state4.AddTransitionToThis("Transition3", state3);
 
-         
+            Assert.IsTrue(stateMachine.TransitionExists("Transition1"));
 
             state1.SetAsStartState();
             state1.OnExit(Method1);
@@ -69,6 +68,8 @@ public void StateMachineFromCode()
             stateMachine.AddData("string1", "Roman");
             stateMachine.AddData("double1", 1001.0005);
 
+            Assert.IsTrue(stateMachine.DataExists("int1"));
+
             stateMachine.Start(parametersForStart);
 
             Assert.AreEqual(stateMachine.CurrentState.Name, "State4");
@@ -81,6 +82,9 @@ public void StateMachineFromXML()
         {
             var loggerFactory = LoggerFactory.Create(builder => { builder.AddConsole().AddDebug().SetMinimumLevel(LogLevel.Debug); });
             var logger = loggerFactory.CreateLogger<StateMachine>();
+
+
+
             StateMachine stateMachine = StateMachine.FromXDocument("text.xml", logger);
 
             stateMachine.GetState("State1").OnExit(Method1);