Skip to content

Commit 74b6842

Browse files
committed
some fix
1 parent c599e21 commit 74b6842

File tree

5 files changed

+42
-37
lines changed

5 files changed

+42
-37
lines changed

Examples/Examples.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
1010
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
1111
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.1.2" />
12+
<PackageReference Include="SimpleStateMachineLibrary" Version="1.2.0" />
1213
</ItemGroup>
1314

1415
<ItemGroup>

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithData.cs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace SimpleStateMachineLibrary
88
public partial class StateMachine
99
{
1010

11-
private Data _GetData(string nameData, out bool result, bool exception)
11+
internal Data _GetData(string nameData, out bool result, bool exception)
1212
{
1313
var data_ = Check.GetElement(_data, nameData, this._logger, out result, exception);
1414

@@ -20,17 +20,17 @@ private Data _GetData(string nameData, out bool result, bool exception)
2020
return data_;
2121
}
2222

23-
private Data _GetData(Data data, out bool result, bool exception)
24-
{
25-
var data_ = Check.GetElement(_data, data, this._logger, out result, exception);
23+
//private Data _GetData(Data data, out bool result, bool exception)
24+
//{
25+
// var data_ = Check.GetElement(_data, data, this._logger, out result, exception);
2626

27-
if (exception)
28-
_logger?.LogDebug("Get data \"{NameData}\"", data.Name);
29-
else
30-
_logger?.LogDebug("Try get data \"{NameData}\"", data.Name);
27+
// if (exception)
28+
// _logger?.LogDebug("Get data \"{NameData}\"", data.Name);
29+
// else
30+
// _logger?.LogDebug("Try get data \"{NameData}\"", data.Name);
3131

32-
return data_;
33-
}
32+
// return data_;
33+
//}
3434

3535

3636
public Data GetData(string nameData)
@@ -43,10 +43,10 @@ public Data TryGetData(string nameData, out bool result)
4343
return _GetData(nameData, out result, false);
4444
}
4545

46-
public Data TryGetData(Data data, out bool result)
47-
{
48-
return _GetData(data, out result, false);
49-
}
46+
//public Data TryGetData(Data data, out bool result)
47+
//{
48+
// return _GetData(data, out result, false);
49+
//}
5050

5151

5252

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithStates.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace SimpleStateMachineLibrary
99
{
1010
public partial class StateMachine
1111
{
12-
private State _GetState(string nameState, out bool result, bool exception)
12+
internal State _GetState(string nameState, out bool result, bool exception)
1313
{
1414
var _state = Check.GetElement(_states, nameState, this._logger, out result, exception);
1515

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitions.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,17 @@ public Transition GetTransition(string nameTransition)
3939
return _GetTransition(nameTransition, out bool result, true);
4040
}
4141

42+
public Transition TryGetTransition(string nameTransition, out bool result)
43+
{
44+
return _GetTransition(nameTransition, out result, false);
45+
}
46+
4247
//public Transition TryGetTransition(Transition transition, out bool result)
4348
//{
4449
// return _GetTransition(transition, out result, false);
4550
//}
4651

47-
public Transition TryGetTransition(string nameTransition, out bool result)
48-
{
49-
return _GetTransition(nameTransition, out result, false);
50-
}
52+
5153

5254

5355

SimpleStateMachineLibrary/StateMachines/StateMachineWorkWithTransitionsForState.cs

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,6 @@ private Dictionary<string, Transition> GetTransitionsFromState(State state, out
2626
return transitionsFromState;
2727
}
2828

29-
private Dictionary<string, Transition> GetTransitionsToState(string stateName, out bool result, bool exceptions)
30-
{
31-
result = Check.Contains(_states, stateName, this._logger, exceptions);
32-
var transitionsToState = result ? _transitions.Values.Where(x => x.StateTo.Name == stateName).ToDictionary(x => x.Name, x => x) : new Dictionary<string, Transition>();
33-
34-
_logger?.LogDebug("Get transitions to state \"{NameState}\" ", stateName);
35-
return transitionsToState;
36-
}
37-
38-
private Dictionary<string, Transition> GetTransitionsToState(State state, out bool result, bool exceptions)
39-
{
40-
result = Check.Contains(_states, state, this._logger, exceptions);
41-
var transitionsToState = result ? _transitions.Values.Where(x => x.StateTo.Name == state.Name).ToDictionary(x => x.Name, x => x) : new Dictionary<string, Transition>();
42-
43-
_logger?.LogDebug("Get transitions to state \"{NameState}\" ", state.Name);
44-
return transitionsToState;
45-
}
46-
4729
public Dictionary<string, Transition> GetTransitionsFromState(string stateName)
4830
{
4931
return GetTransitionsFromState(stateName, out bool result, true);
@@ -64,6 +46,26 @@ public Dictionary<string, Transition> TryGetTransitionsFromState(State state, ou
6446
return GetTransitionsFromState(state, out result, false);
6547
}
6648

49+
50+
51+
private Dictionary<string, Transition> GetTransitionsToState(string stateName, out bool result, bool exceptions)
52+
{
53+
result = Check.Contains(_states, stateName, this._logger, exceptions);
54+
var transitionsToState = result ? _transitions.Values.Where(x => x.StateTo.Name == stateName).ToDictionary(x => x.Name, x => x) : new Dictionary<string, Transition>();
55+
56+
_logger?.LogDebug("Get transitions to state \"{NameState}\" ", stateName);
57+
return transitionsToState;
58+
}
59+
60+
private Dictionary<string, Transition> GetTransitionsToState(State state, out bool result, bool exceptions)
61+
{
62+
result = Check.Contains(_states, state, this._logger, exceptions);
63+
var transitionsToState = result ? _transitions.Values.Where(x => x.StateTo.Name == state.Name).ToDictionary(x => x.Name, x => x) : new Dictionary<string, Transition>();
64+
65+
_logger?.LogDebug("Get transitions to state \"{NameState}\" ", state.Name);
66+
return transitionsToState;
67+
}
68+
6769
public Dictionary<string, Transition> GetTransitionsToState(string stateName)
6870
{
6971
return GetTransitionsToState(stateName, out bool result, true);

0 commit comments

Comments
 (0)