diff --git a/.github/workflows/project-build.yml b/.github/workflows/project-build.yml index a70d8cb..959aa4c 100644 --- a/.github/workflows/project-build.yml +++ b/.github/workflows/project-build.yml @@ -17,9 +17,12 @@ jobs: - name: Build run: dotnet build -c Release --no-restore - - name: Test + - name: Unit tests run: dotnet test -c Release --no-restore --no-build -v=normal --collect:"XPlat Code Coverage" + - name: Performance tests + run: dotnet test -c Release --no-restore --no-build -v=normal --filter TestCategory="PerfTests" + - name: Upload coverage reports to Codecov uses: codecov/codecov-action@v4.0.1 with: @@ -39,3 +42,10 @@ jobs: path: bin/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/Release/*.nupkg retention-days: 1 + - name: Upload performance tests artifacts + uses: actions/upload-artifact@v4 + with: + name: performance-tests + path: bin/NoStringEvaluating.Tests/Release/PerformanceTestsResults/PerformanceTests.txt + retention-days: 90 + diff --git a/BenchResults/Benchmark.xlsx b/BenchResults/Benchmark.xlsx deleted file mode 100644 index 7d3eada..0000000 Binary files a/BenchResults/Benchmark.xlsx and /dev/null differ diff --git a/BenchResults/both.html b/BenchResults/both.html deleted file mode 100644 index 4855b89..0000000 --- a/BenchResults/both.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - -ConsoleApp.Benchmark.BenchNumbers-20230209-135445 - - - - -

-BenchmarkDotNet=v0.13.4, OS=Windows 10 (10.0.19044.2486/21H2/November2021Update)
-11th Gen Intel Core i7-1185G7 3.00GHz, 1 CPU, 8 logical and 4 physical cores
-.NET SDK=7.0.101
-  [Host]     : .NET 7.0.1 (7.0.122.56804), X64 RyuJIT AVX2
-  Job-MQTNJN : .NET 7.0.1 (7.0.122.56804), X64 RyuJIT AVX2
-
-
InvocationCount=3  IterationCount=10  RunStrategy=Monitoring  
-UnrollFactor=1  WarmupCount=2  
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Method MeanErrorStdDev Gen0 Gen1Gen2Allocated
Empty_NoString24.74 ms0.829 ms0.548 ms---3.22 KB
NumberOnly_NoString38.10 ms1.113 ms0.736 ms---3.61 KB
Formula1_NoString45.39 ms2.245 ms1.485 ms---3.74 KB
Formula2_NoString88.92 ms4.535 ms2.999 ms---4.6 KB
Formula3_NoString85.46 ms1.402 ms0.927 ms---5.08 KB
Formula4_NoString286.13 ms14.831 ms9.810 ms---9.84 KB
Formula5_NoString135.77 ms2.910 ms1.925 ms---4.98 KB
Formula6_NoString322.18 ms1.654 ms1.094 ms---8.26 KB
Formula7_NoString128.52 ms1.588 ms1.050 ms---4.8 KB
Formula8_NoString258.23 ms5.151 ms3.407 ms---6.59 KB
Formula9_NoString553.44 ms9.307 ms6.156 ms---10.96 KB
Formula10_NoString226.04 ms4.389 ms2.903 ms---5.65 KB
Empty_MxParser97.18 ms1.172 ms0.775 ms66000.0000--406250.95 KB
NumberOnly_MxParser88.39 ms2.043 ms1.351 ms24000.0000--148515.88 KB
Formula1_MxParser134.85 ms1.794 ms1.186 ms44333.3333--273523.88 KB
Formula2_MxParser455.16 ms4.682 ms3.097 ms184666.6667333.3333-1133048.41 KB
Formula3_MxParser580.63 ms7.148 ms4.728 ms270333.33331000.0000-1656536.5 KB
Formula4_MxParser2,519.84 ms55.817 ms36.920 ms1135000.000022666.6667-6954199.7 KB
Formula5_MxParser350.81 ms11.546 ms7.637 ms99333.3333--609594.48 KB
Formula6_MxParser1,331.11 ms22.133 ms14.640 ms539333.33334000.0000-3305395.58 KB
Formula7_MxParser321.38 ms9.344 ms6.180 ms131333.3333--804816.88 KB
Formula8_MxParser694.13 ms20.828 ms13.777 ms341666.66671333.3333-2094014.2 KB
Formula9_MxParser8,540.56 ms67.741 ms44.807 ms1447666.6667366000.00005666.66679360871.28 KB
Formula10_MxParser684.27 ms22.928 ms15.165 ms247333.3333666.6667-1515846.02 KB
- - diff --git a/CodeAnalysis.ruleset b/CodeAnalysis.ruleset index ced4c68..8f8d4e3 100644 --- a/CodeAnalysis.ruleset +++ b/CodeAnalysis.ruleset @@ -1,5 +1,11 @@  + + + + + + diff --git a/Directory.Build.props b/Directory.Build.props index 29919a8..267fdbd 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@ - net7.0 + net8 enable $(MSBuildThisFileDirectory) diff --git a/Directory.Packages.props b/Directory.Packages.props index aff5818..5cae333 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,19 +1,18 @@ - - + + + - - - - + + + - - - - - + + + + \ No newline at end of file diff --git a/Images/Both.png b/Images/Both.png deleted file mode 100644 index 608322b..0000000 Binary files a/Images/Both.png and /dev/null differ diff --git a/Images/Graph.png b/Images/Graph.png deleted file mode 100644 index 13a86bc..0000000 Binary files a/Images/Graph.png and /dev/null differ diff --git a/Images/Table.png b/Images/Table.png deleted file mode 100644 index 9f48864..0000000 Binary files a/Images/Table.png and /dev/null differ diff --git a/NoStringEvaluating.Tests/Helpers/FormulaModelFactory.cs b/NoStringEvaluating.Tests/Helpers/FormulaModelFactory.cs deleted file mode 100644 index dcd5d0e..0000000 --- a/NoStringEvaluating.Tests/Helpers/FormulaModelFactory.cs +++ /dev/null @@ -1,29 +0,0 @@ -using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Models; - -namespace NoStringEvaluating.Tests.Helpers; - -internal static class FormulaModelFactory -{ - public static FormulaModel CreateTestModelToCheck(string formula, bool expectedOkresult) - { - var model = new FormulaModel(formula, "NULL", double.NaN, expectedOkresult); - return model; - } - - public static FormulaModel CreateTestModel(string formula, EvaluatorValue result, params (string, EvaluatorValue)[] arguments) - { - return CreateTestModel(formula, "NULL", result, arguments); - } - - public static FormulaModel CreateTestModel(string formula, string parsedFormula, EvaluatorValue result, params (string, EvaluatorValue)[] arguments) - { - var model = new FormulaModel(formula, parsedFormula, result); - foreach (var argument in arguments) - { - model.Arguments[argument.Item1] = argument.Item2; - } - - return model; - } -} diff --git a/NoStringEvaluating.Tests/Models/FormulaModel.cs b/NoStringEvaluating.Tests/Models/FormulaModel.cs deleted file mode 100644 index 2ee3425..0000000 --- a/NoStringEvaluating.Tests/Models/FormulaModel.cs +++ /dev/null @@ -1,30 +0,0 @@ -using NoStringEvaluating.Models.Values; - -namespace NoStringEvaluating.Tests.Models; - -public class FormulaModel -{ - public string Formula { get; } - - public string ParsedFormula { get; } - - public EvaluatorValue Result { get; } - - public bool ExpectedOkResult { get; } - - public Dictionary Arguments { get; } - - public FormulaModel(string formula, string parsedFormula, EvaluatorValue result, bool expectedOkResult = true) - { - Formula = formula; - ParsedFormula = parsedFormula; - Result = result; - ExpectedOkResult = expectedOkResult; - Arguments = new Dictionary(); - } - - public override string ToString() - { - return Formula; - } -} diff --git a/NoStringEvaluating.sln b/NoStringEvaluating.sln index a043bd3..43235c9 100644 --- a/NoStringEvaluating.sln +++ b/NoStringEvaluating.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32611.2 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating", "NoStringEvaluating\NoStringEvaluating.csproj", "{40AB411F-6002-4A69-A73F-17C5B7FC1508}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating", "src\NoStringEvaluating\NoStringEvaluating.csproj", "{40AB411F-6002-4A69-A73F-17C5B7FC1508}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Tests", "NoStringEvaluating.Tests\NoStringEvaluating.Tests.csproj", "{48E04BE8-5BA6-409A-964E-13206F95BC8D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Tests", "src\NoStringEvaluating.Tests\NoStringEvaluating.Tests.csproj", "{48E04BE8-5BA6-409A-964E-13206F95BC8D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{EA941063-94B8-4F97-A507-B5A7FD6A0B79}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{6A870F87-7BD9-4DB3-ACA2-0F2EFF9FB1D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\ConsoleApp\ConsoleApp.csproj", "{6A870F87-7BD9-4DB3-ACA2-0F2EFF9FB1D3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88F0773E-1AA1-4C00-A8D8-F09B76A70BE9}" ProjectSection(SolutionItems) = preProject @@ -17,9 +17,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection", "NoStringEvaluating.Extensions.Microsoft.DependencyInjection\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj", "{03E4E4C4-C186-4865-AC39-8E5E192D7F14}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection", "src\NoStringEvaluating.Extensions.Microsoft.DependencyInjection\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj", "{03E4E4C4-C186-4865-AC39-8E5E192D7F14}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests", "NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj", "{95AC9D45-49F2-41A2-88BC-E800F932C356}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests", "src\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests\NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj", "{95AC9D45-49F2-41A2-88BC-E800F932C356}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Ci", "Ci", "{F2A9F436-5A49-486D-B4E1-B1B38924F61B}" ProjectSection(SolutionItems) = preProject diff --git a/NoStringEvaluating/Exceptions/NoStringFunctionException.cs b/NoStringEvaluating/Exceptions/NoStringFunctionException.cs deleted file mode 100644 index 53afe07..0000000 --- a/NoStringEvaluating/Exceptions/NoStringFunctionException.cs +++ /dev/null @@ -1,15 +0,0 @@ -namespace NoStringEvaluating.Exceptions; - -/// -/// Raises when function exception -/// -public class NoStringFunctionException : Exception -{ - /// - /// Raises when function exception - /// - public NoStringFunctionException(string funcName) - : base($"Function \"{funcName}\" has already added") - { - } -} diff --git a/NoStringEvaluating/Exceptions/VariableNotFoundException.cs b/NoStringEvaluating/Exceptions/VariableNotFoundException.cs deleted file mode 100644 index e3cbcd6..0000000 --- a/NoStringEvaluating/Exceptions/VariableNotFoundException.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace NoStringEvaluating.Exceptions; - -/// -/// Raises when can't find a variable -/// -public class VariableNotFoundException : Exception -{ - /// - /// VariableName - /// - public string VariableName { get; set; } - - /// - /// Raises when can't find a variable - /// - public VariableNotFoundException(string variableName, string message) - : base(message) - { - VariableName = variableName; - } -} diff --git a/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs b/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs deleted file mode 100644 index 3d3597a..0000000 --- a/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs +++ /dev/null @@ -1,20 +0,0 @@ -namespace NoStringEvaluating.Nodes.Base; - -/// -/// Formula node -/// -public abstract class BaseFormulaNode -{ - /// - /// Type key - /// - public NodeTypeEnum TypeKey { get; } - - /// - /// Formula node - /// - protected BaseFormulaNode(NodeTypeEnum typeKey) - { - TypeKey = typeKey; - } -} diff --git a/NoStringEvaluating/Nodes/Common/FormulaNodes.cs b/NoStringEvaluating/Nodes/Common/FormulaNodes.cs deleted file mode 100644 index da71839..0000000 --- a/NoStringEvaluating/Nodes/Common/FormulaNodes.cs +++ /dev/null @@ -1,33 +0,0 @@ -using NoStringEvaluating.Nodes.Base; - -namespace NoStringEvaluating.Nodes.Common; - -/// -/// Formula nodes -/// -public class FormulaNodes -{ - /// - /// Nodes - /// - public List Nodes { get; } - - /// - /// Formula nodes - /// - public FormulaNodes(List nodes) - { - // I've removed ".AsReadOnly()" owing to the fact that it turned out to be slower then List ¯\_(ツ)_/¯ - // It was tested with Benchmark.One and Benchmark.Formula4. With AsReadOnly I got 300ms where as with List I got 200ms - // Okay, if someone change collection it will be his mistake, let it be! - Nodes = nodes; - } - - /// - /// ToString - /// - public override string ToString() - { - return string.Join(" ", Nodes); - } -} diff --git a/README.md b/README.md index 05ccfc8..42215ce 100644 --- a/README.md +++ b/README.md @@ -76,7 +76,7 @@ Compared with a good solution [mXparser](https://github.com/mariuszgromada/MathP | 3 | 3 \* (9 / 456 \* (32 + 12)) / 17 - 3 | | 4 | (2 + 6 - (13 \* 24 + 5 / (123 - 364 + 23))) - (2 + 6 - (13 \* 24 + 5 / (123 - 364 + 23))) + (2 + 6 - (13 \* 24 + 5 / (123 - 364 + 23))) \* 345 \* ((897 - 323)/ 23) | | 5 | Arg1 \* Arg2 + Arg3 - Arg4 | -| 6 | Arg1 \* (Arg2 + Arg3) - Arg4 / (Arg5 - Arg6) + 45 \* Arg7 + ((Arg8 \* 56 + (12 + Arg9))) - Arg10 | +| 6 | Arg1 \* (Arg2 + Arg3) - Arg4 / (Arg5 - Arg6 + 1) + 45 \* Arg7 + ((Arg8 \* 56 + (12 + Arg9))) - Arg10 | | 7 | add(1; 2; 3) | | 8 | add(add(5; 1) - add(5; 2; 3)) | | 9 | if(Arg1 > 0; add(56 + 9 / 12 \* 123.596; or(78; 9; 5; 2; 4; 5; 8; 7); 45;5); 9) \* 24 + 52 -33 | @@ -84,18 +84,18 @@ Compared with a good solution [mXparser](https://github.com/mariuszgromada/MathP ### 1 000 000 calculations Less is better -![image graph](Images/Graph.png) -![image table](Images/Table.png) +![image graph](images/Graph.png) +![image table](images/Table.png) ### Benchmark results -![Both](Images/Both.png) +![Both](images/Both.png) ### Conclusion As you can see this solution is faster in all cases, furthermore there isn't any garbage collection. -Benchmark code - [ConsoleApp/Benchmark/BenchmarkNumberService.cs](ConsoleApp/Benchmark/BenchmarkNumberService.cs "ConsoleApp/Benchmark/BenchmarkNumberService.cs") +Benchmark code - [src/ConsoleApp/Benchmark/BenchNumbers.cs](src/ConsoleApp/Benchmark/BenchNumbers.cs "src/ConsoleApp/Benchmark/BenchNumbers.cs") -Benchmark excel - [BenchResults/Benchmark.xlsx](BenchResults/Benchmark.xlsx "BenchResults/Benchmark.xlsx") +Benchmark excel - [benchResults/Benchmark.xlsx](benchResults/Benchmark.xlsx "benchResults/Benchmark.xlsx") ## Quick start ### Initialization diff --git a/benchResults/Benchmark.xlsx b/benchResults/Benchmark.xlsx new file mode 100644 index 0000000..9187ce0 Binary files /dev/null and b/benchResults/Benchmark.xlsx differ diff --git a/benchResults/Both.html b/benchResults/Both.html new file mode 100644 index 0000000..0ede071 --- /dev/null +++ b/benchResults/Both.html @@ -0,0 +1,55 @@ + + + + +ConsoleApp.Benchmark.BenchNumbers-20240817-115246 + + + + +

+BenchmarkDotNet v0.14.0, Windows 10 (10.0.19045.4780/22H2/2022Update)
+11th Gen Intel Core i7-1185G7 3.00GHz, 1 CPU, 8 logical and 4 physical cores
+.NET SDK 8.0.200
+  [Host]     : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL+VBMI
+  Job-JNKMUS : .NET 8.0.2 (8.0.224.6711), X64 RyuJIT AVX-512F+CD+BW+DQ+VL+VBMI
+
+
InvocationCount=3  IterationCount=10  RunStrategy=Monitoring  
+UnrollFactor=1  WarmupCount=2  
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Method Mean ErrorStdDevGen0 Gen1 Gen2Allocated
Empty_NoString34.55 ms1.465 ms0.969 ms---5.51 KB
NumberOnly_NoString47.08 ms1.901 ms1.257 ms---5.9 KB
Formula1_NoString51.46 ms2.871 ms1.899 ms---6.03 KB
Formula2_NoString98.33 ms9.107 ms6.024 ms---6.89 KB
Formula3_NoString76.44 ms1.671 ms1.105 ms---7.38 KB
Formula4_NoString263.56 ms2.482 ms1.642 ms---12.13 KB
Formula5_NoString145.10 ms12.141 ms8.031 ms---7.27 KB
Formula6_NoString302.92 ms30.212 ms19.983 ms---10.55 KB
Formula7_NoString145.03 ms6.809 ms4.504 ms---7.1 KB
Formula8_NoString291.57 ms12.880 ms8.519 ms---8.89 KB
Formula9_NoString551.50 ms10.342 ms6.841 ms---13.25 KB
Formula10_NoString216.98 ms16.591 ms10.974 ms---7.94 KB
Empty_MxParser93.31 ms9.150 ms6.052 ms66000.0000--406250.92 KB
NumberOnly_MxParser90.66 ms3.553 ms2.350 ms24000.0000--148515.66 KB
Formula1_MxParser137.42 ms2.914 ms1.928 ms44333.3333--273522.6 KB
Formula2_MxParser433.20 ms42.304 ms27.982 ms184666.6667333.3333-1133044.61 KB
Formula3_MxParser588.55 ms34.226 ms22.639 ms270333.33331000.0000-1656532.77 KB
Formula4_MxParser2,367.88 ms155.146 ms102.619 ms1135000.000022333.3333-6954188.17 KB
Formula5_MxParser276.39 ms6.087 ms4.026 ms99333.3333--609582.25 KB
Formula6_MxParser1,104.95 ms68.355 ms45.213 ms539333.33334333.3333-3305396.21 KB
Formula7_MxParser279.89 ms3.204 ms2.119 ms131333.3333--804815.08 KB
Formula8_MxParser617.36 ms12.880 ms8.519 ms341666.66671666.6667-2094008.94 KB
Formula9_MxParser7,669.47 ms98.175 ms64.937 ms1447666.6667366000.00005666.66679360854.98 KB
Formula10_MxParser626.87 ms7.463 ms4.937 ms247333.3333666.6667-1515840.71 KB
+ + diff --git a/images/Both.png b/images/Both.png new file mode 100644 index 0000000..1c19e63 Binary files /dev/null and b/images/Both.png differ diff --git a/images/Graph.png b/images/Graph.png new file mode 100644 index 0000000..ccb489b Binary files /dev/null and b/images/Graph.png differ diff --git a/images/Table.png b/images/Table.png new file mode 100644 index 0000000..7a82457 Binary files /dev/null and b/images/Table.png differ diff --git a/ConsoleApp/Benchmark/Base/BenchBase.cs b/src/ConsoleApp/Benchmark/Base/BenchBase.cs similarity index 96% rename from ConsoleApp/Benchmark/Base/BenchBase.cs rename to src/ConsoleApp/Benchmark/Base/BenchBase.cs index 0c6f0a5..ebfc6b5 100644 --- a/ConsoleApp/Benchmark/Base/BenchBase.cs +++ b/src/ConsoleApp/Benchmark/Base/BenchBase.cs @@ -23,20 +23,20 @@ public abstract class BenchBase [GlobalSetup] public virtual void Setup() { - _usedFunctions = new IFunction[] - { + _usedFunctions = + [ new AddFunction(), new IfFunction(), new OrFunction(), new Func_kov(), new Func_kovt(), - }; + ]; - _usedFunctionsMxParser = new[] - { + _usedFunctionsMxParser = + [ new Function("kov", new FExtension_kov()), new Function("kovt", new FExtension_kovt()), - }; + ]; mXparser.disableAlmostIntRounding(); mXparser.disableUlpRounding(); @@ -139,7 +139,7 @@ private Expression CreateMxParser(string formula) public const string Formula4 = "(2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) - (2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) + (2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) * 345 * ((897 - 323)/ 23)"; public const string Formula5 = $"{Arg1} * {Arg2} + {Arg3} - {Arg4}"; - public const string Formula6 = $"{Arg1} * ({Arg2} + {Arg3}) - {Arg4} / ({Arg5} - {Arg6}) + 45 * {Arg7} + (({Arg8} * 56 + (12 + {Arg9}))) - {Arg10}"; + public const string Formula6 = $"{Arg1} * ({Arg2} + {Arg3}) - {Arg4} / ({Arg5} - {Arg6} + 1) + 45 * {Arg7} + (({Arg8} * 56 + (12 + {Arg9}))) - {Arg10}"; public const string Formula7 = $"add(1; 2; 3)"; public const string Formula8 = $"add(add(5; 1) - add(5; 2; 3))"; diff --git a/ConsoleApp/Benchmark/BenchNumbers.cs b/src/ConsoleApp/Benchmark/BenchNumbers.cs similarity index 100% rename from ConsoleApp/Benchmark/BenchNumbers.cs rename to src/ConsoleApp/Benchmark/BenchNumbers.cs diff --git a/ConsoleApp/Benchmark/BenchParallel.cs b/src/ConsoleApp/Benchmark/BenchParallel.cs similarity index 100% rename from ConsoleApp/Benchmark/BenchParallel.cs rename to src/ConsoleApp/Benchmark/BenchParallel.cs diff --git a/ConsoleApp/ConsoleApp.csproj b/src/ConsoleApp/ConsoleApp.csproj similarity index 100% rename from ConsoleApp/ConsoleApp.csproj rename to src/ConsoleApp/ConsoleApp.csproj diff --git a/ConsoleApp/NoStringNinjectModule.cs b/src/ConsoleApp/NoStringNinjectModule.cs similarity index 100% rename from ConsoleApp/NoStringNinjectModule.cs rename to src/ConsoleApp/NoStringNinjectModule.cs diff --git a/ConsoleApp/Program.cs b/src/ConsoleApp/Program.cs similarity index 100% rename from ConsoleApp/Program.cs rename to src/ConsoleApp/Program.cs diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests.csproj diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluatorExtensionsTests.cs b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluatorExtensionsTests.cs similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluatorExtensionsTests.cs rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.Tests/NoStringEvaluatorExtensionsTests.cs diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.csproj diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.xml b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.xml similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.xml rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluating.Extensions.Microsoft.DependencyInjection.xml diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluatorExtensions.cs b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluatorExtensions.cs similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluatorExtensions.cs rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/NoStringEvaluatorExtensions.cs diff --git a/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/logo.png b/src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/logo.png similarity index 100% rename from NoStringEvaluating.Extensions.Microsoft.DependencyInjection/logo.png rename to src/NoStringEvaluating.Extensions.Microsoft.DependencyInjection/logo.png diff --git a/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj b/src/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj similarity index 77% rename from NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj rename to src/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj index e3b85f1..f0a633b 100644 --- a/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj +++ b/src/NoStringEvaluating.Tests/NoStringEvaluating.Tests.csproj @@ -9,4 +9,8 @@ + + + + diff --git a/src/NoStringEvaluating.Tests/PerfTests/PerformanceTests.cs b/src/NoStringEvaluating.Tests/PerfTests/PerformanceTests.cs new file mode 100644 index 0000000..486fcc2 --- /dev/null +++ b/src/NoStringEvaluating.Tests/PerfTests/PerformanceTests.cs @@ -0,0 +1,115 @@ +using System.Diagnostics; +using NoStringEvaluating.Factories; +using NoStringEvaluating.Functions.Base; +using NoStringEvaluating.Functions.Logic; +using NoStringEvaluating.Functions.Math; +using NoStringEvaluating.Models.Values; +using NoStringEvaluating.Tests.PerfTests.Report; +using NUnit.Framework; + +namespace NoStringEvaluating.Tests.PerfTests; + +[NonParallelizable] +[Category("PerfTests")] +[Explicit("These tests are only run when explicitly specified")] +internal class PerformanceTests +{ + private NoStringEvaluator.Facade _serviceFacade; + private ReportContainer _report; + + [OneTimeSetUp] + public void GlobalSetup() + { + _report = new(); + } + + [OneTimeTearDown] + public void GlobalTeardown() + { + ReportWriter.Write(_report); + } + + [SetUp] + public void Setup() + { + var functions = new IFunction[] + { + new AddFunction(), + new IfFunction(), + new OrFunction(), + new Func_kov(), + new Func_kovt(), + }; + + _serviceFacade = NoStringEvaluator.CreateFacade(cfg => cfg.WithoutDefaultFunctions().WithFunctions(functions)); + } + + [TestCaseSource(nameof(RunSource))] + public void RunFormula(string formulaName, string formula, IDictionary args, long targetElapsedMilliseconds) + { + // arrange + var n = 1_000_000; + + var nodes = _serviceFacade.FormulaCache.GetFormulaNodes(formula); + + // act, assert + var res = _serviceFacade.Evaluator.CalcNumber(nodes, args); + + var ela = Stopwatch.StartNew(); + for (var i = 0; i < n; i++) + { + _ = _serviceFacade.Evaluator.Calc(nodes, args); + } + + ela.Stop(); + + _report.Append(formulaName, res, ela.ElapsedMilliseconds, targetElapsedMilliseconds); + } + + private static IEnumerable RunSource() + { + var args = Enumerable.Range(1, 10).ToDictionary(i => $"Arg{i}", _ => (EvaluatorValue)1.7); + + yield return new object[] { "Formula 1", "3 * 9", args, 300 }; + yield return new object[] { "Formula 2", "3 * 9 / 456 * 32 + 12 / 17 - 3", args, 250 }; + yield return new object[] { "Formula 3", "3 * (9 / 456 * (32 + 12)) / 17 - 3", args, 250 }; + yield return new object[] { "Formula 4", "(2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) - (2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) + (2 + 6 - (13 * 24 + 5 / (123 - 364 + 23))) * 345 * ((897 - 323)/ 23)", args, 500 }; + yield return new object[] { "Formula 5", "Arg1 * Arg2 + Arg3 - Arg4", args, 400 }; + yield return new object[] { "Formula 6", "Arg1 * (Arg2 + Arg3) - Arg4 / (Arg5 - Arg6 + 1) + 45 * Arg7 + ((Arg8 * 56 + (12 + Arg9))) - Arg10", args, 600 }; + yield return new object[] { "Formula 7", "add(1; 2; 3)", args, 400 }; + yield return new object[] { "Formula 8", "add(add(5; 1) - add(5; 2; 3))", args, 400 }; + yield return new object[] { "Formula 9", "if(Arg1 > 0; add(56 + 9 / 12 * 123.596; or(78; 9; 5; 2; 4; 5; 8; 7); 45;5); 9) * 24 + 52 -33", args, 900 }; + yield return new object[] { "Formula 10", "kov(1; 2; 3) - kovt(8; 9)", args, 400 }; + } + + public class Func_kov : IFunction + { + public string Name { get; } = "kov"; + + public bool CanHandleNullArguments { get; } + + public InternalEvaluatorValue Execute(List args, ValueFactory factory) + { + var res = 1d; + + for (int i = 0; i < args.Count; i++) + { + res *= args[i]; + } + + return res; + } + } + + public class Func_kovt : IFunction + { + public string Name { get; } = "kovt"; + + public bool CanHandleNullArguments { get; } + + public InternalEvaluatorValue Execute(List args, ValueFactory factory) + { + return args[0] - args[1]; + } + } +} diff --git a/src/NoStringEvaluating.Tests/PerfTests/Report/ReportContainer.cs b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportContainer.cs new file mode 100644 index 0000000..cc87531 --- /dev/null +++ b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportContainer.cs @@ -0,0 +1,11 @@ +namespace NoStringEvaluating.Tests.PerfTests.Report; + +internal class ReportContainer +{ + public List Items = []; + + public void Append(string formula, double result, long elapsedMilliseconds, long targetElapsedMilliseconds) + { + Items.Add(new ReportItem(formula, result, elapsedMilliseconds, targetElapsedMilliseconds)); + } +} diff --git a/src/NoStringEvaluating.Tests/PerfTests/Report/ReportExtensions.cs b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportExtensions.cs new file mode 100644 index 0000000..8398912 --- /dev/null +++ b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportExtensions.cs @@ -0,0 +1,37 @@ +using System.Globalization; +using Spectre.Console; + +namespace NoStringEvaluating.Tests.PerfTests.Report; + +internal static class ReportExtensions +{ + public static Table AddRows(this Table table, IEnumerable items) + { + foreach (var item in items) + { + table.AddRow(item); + } + + return table; + } + + public static void AddRow(this Table table, ReportItem value) + { + table.AddRow( + value.Formula.ToText(), + value.Result.ToText(), + value.ElapsedMilliseconds.ToString().ToText(), + value.TargetElapsedMilliseconds.ToString().ToText(), + value.Attention ? "!".ToText() : string.Empty.ToText()); + } + + public static Text ToText(this double value) + { + return value.ToString("0.00", CultureInfo.InvariantCulture).ToText(); + } + + public static Text ToText(this string value) + { + return new Text(value); + } +} diff --git a/src/NoStringEvaluating.Tests/PerfTests/Report/ReportItem.cs b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportItem.cs new file mode 100644 index 0000000..0d9c7cd --- /dev/null +++ b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportItem.cs @@ -0,0 +1,6 @@ +namespace NoStringEvaluating.Tests.PerfTests.Report; + +internal record ReportItem(string Formula, double Result, long ElapsedMilliseconds, long TargetElapsedMilliseconds) +{ + public bool Attention => ElapsedMilliseconds > TargetElapsedMilliseconds; +} diff --git a/src/NoStringEvaluating.Tests/PerfTests/Report/ReportWriter.cs b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportWriter.cs new file mode 100644 index 0000000..5195f6b --- /dev/null +++ b/src/NoStringEvaluating.Tests/PerfTests/Report/ReportWriter.cs @@ -0,0 +1,36 @@ +using NUnit.Framework; +using Spectre.Console; + +namespace NoStringEvaluating.Tests.PerfTests.Report; + +internal class ReportWriter +{ + private const string DIRECTORY = "PerformanceTestsResults"; + private const string FILE_PATH = $"{DIRECTORY}/PerformanceTests.txt"; + + public static void Write(ReportContainer resultsContainer) + { + if (!Directory.Exists(DIRECTORY)) + { + Directory.CreateDirectory(DIRECTORY); + } + + using var streamWriter = new StreamWriter(FILE_PATH); + + var table = new Table() + .SquareBorder() + .AddColumns("Formula", "Result", "Elapsed time, ms", "Threshold, ms") + .AddColumn(new TableColumn($"Attention").Centered()) + .AddRows(resultsContainer.Items); + + AnsiConsole.Console.Profile.Width = 100; + + AnsiConsole.Record(); + AnsiConsole.Write(table); + + var text = AnsiConsole.ExportText(); + + TestContext.Progress.WriteLine(text); + streamWriter.WriteLine(text); + } +} diff --git a/NoStringEvaluating.Tests/Properties/AssemblyInfo.cs b/src/NoStringEvaluating.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from NoStringEvaluating.Tests/Properties/AssemblyInfo.cs rename to src/NoStringEvaluating.Tests/Properties/AssemblyInfo.cs diff --git a/NoStringEvaluating.Tests/Suite.cs b/src/NoStringEvaluating.Tests/Suite.cs similarity index 100% rename from NoStringEvaluating.Tests/Suite.cs rename to src/NoStringEvaluating.Tests/Suite.cs diff --git a/NoStringEvaluating.Tests/Data/CheckFormula.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/CheckFormula.cs similarity index 93% rename from NoStringEvaluating.Tests/Data/CheckFormula.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/CheckFormula.cs index 4845998..6baad5c 100644 --- a/NoStringEvaluating.Tests/Data/CheckFormula.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/CheckFormula.cs @@ -1,7 +1,7 @@ -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class CheckFormula { diff --git a/NoStringEvaluating.Tests/Data/EvaluateBoolean.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateBoolean.cs similarity index 96% rename from NoStringEvaluating.Tests/Data/EvaluateBoolean.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateBoolean.cs index 2faa373..ee67a0c 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateBoolean.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateBoolean.cs @@ -1,7 +1,7 @@ -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateBoolean { diff --git a/NoStringEvaluating.Tests/Data/EvaluateDateTime.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateDateTime.cs similarity index 82% rename from NoStringEvaluating.Tests/Data/EvaluateDateTime.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateDateTime.cs index 4c681f3..f5ae94f 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateDateTime.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateDateTime.cs @@ -1,8 +1,8 @@ using System.Globalization; -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateDateTime { diff --git a/NoStringEvaluating.Tests/Data/EvaluateNumber.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumber.cs similarity index 98% rename from NoStringEvaluating.Tests/Data/EvaluateNumber.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumber.cs index 5f392a7..36d57ed 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateNumber.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumber.cs @@ -1,8 +1,8 @@ using System.Globalization; -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateNumber { diff --git a/NoStringEvaluating.Tests/Data/EvaluateNumberList.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumberList.cs similarity index 72% rename from NoStringEvaluating.Tests/Data/EvaluateNumberList.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumberList.cs index 748aed0..ace9a6d 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateNumberList.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateNumberList.cs @@ -1,7 +1,7 @@ -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateNumberList { diff --git a/NoStringEvaluating.Tests/Data/EvaluateWord.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWord.cs similarity index 96% rename from NoStringEvaluating.Tests/Data/EvaluateWord.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWord.cs index a3b8c04..a94f9b3 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateWord.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWord.cs @@ -1,8 +1,8 @@ using System.Globalization; -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateWord { diff --git a/NoStringEvaluating.Tests/Data/EvaluateWordList.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWordList.cs similarity index 94% rename from NoStringEvaluating.Tests/Data/EvaluateWordList.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWordList.cs index e14e787..ad142cb 100644 --- a/NoStringEvaluating.Tests/Data/EvaluateWordList.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/EvaluateWordList.cs @@ -1,7 +1,7 @@ -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class EvaluateWordList { diff --git a/NoStringEvaluating.Tests/Data/ParseFormula.cs b/src/NoStringEvaluating.Tests/UnitTests/Data/ParseFormula.cs similarity index 91% rename from NoStringEvaluating.Tests/Data/ParseFormula.cs rename to src/NoStringEvaluating.Tests/UnitTests/Data/ParseFormula.cs index 73f39d3..4bd0020 100644 --- a/NoStringEvaluating.Tests/Data/ParseFormula.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Data/ParseFormula.cs @@ -1,7 +1,7 @@ -using NoStringEvaluating.Tests.Models; -using static NoStringEvaluating.Tests.Helpers.FormulaModelFactory; +using NoStringEvaluating.Tests.UnitTests.Models; +using static NoStringEvaluating.Tests.UnitTests.Helpers.FormulaModelFactory; -namespace NoStringEvaluating.Tests.Data; +namespace NoStringEvaluating.Tests.UnitTests.Data; internal static class ParseFormula { diff --git a/NoStringEvaluating.Tests/Functions/Excel/CountFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/CountFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/CountFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/CountFunctionTests.cs index 67e12bb..53b204e 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/CountFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/CountFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class CountFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/AddHoursFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddHoursFunctionTests.cs similarity index 87% rename from NoStringEvaluating.Tests/Functions/Excel/Date/AddHoursFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddHoursFunctionTests.cs index 2f28f91..ab9b33d 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/AddHoursFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddHoursFunctionTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Functions.Excel.Date; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class AddHoursFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/AddMinutesFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddMinutesFunctionTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/Excel/Date/AddMinutesFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddMinutesFunctionTests.cs index f96ef2c..937f609 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/AddMinutesFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddMinutesFunctionTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Functions.Excel.Date; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class AddMinutesFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/AddSecondsFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddSecondsFunctionTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/Excel/Date/AddSecondsFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddSecondsFunctionTests.cs index 535fc97..03091ef 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/AddSecondsFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/AddSecondsFunctionTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Functions.Excel.Date; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class AddSecondsFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/DateDifFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateDifFunctionTests.cs similarity index 96% rename from NoStringEvaluating.Tests/Functions/Excel/Date/DateDifFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateDifFunctionTests.cs index 48f9a01..924f5dd 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/DateDifFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateDifFunctionTests.cs @@ -4,7 +4,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class DateDifFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/DateFormatFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateFormatFunctionTests.cs similarity index 92% rename from NoStringEvaluating.Tests/Functions/Excel/Date/DateFormatFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateFormatFunctionTests.cs index 48c462f..8a17864 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/DateFormatFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DateFormatFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class DateFormatFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/DayFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DayFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Date/DayFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DayFunctionTests.cs index 3896428..88d53f2 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/DayFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/DayFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class DayFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/MonthFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/MonthFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Date/MonthFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/MonthFunctionTests.cs index 3999760..05cf4b1 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/MonthFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/MonthFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class MonthFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/NowFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/NowFunctionTests.cs similarity index 89% rename from NoStringEvaluating.Tests/Functions/Excel/Date/NowFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/NowFunctionTests.cs index 9427dad..016183b 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/NowFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/NowFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class NowFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/TimeDifFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TimeDifFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Date/TimeDifFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TimeDifFunctionTests.cs index c73834a..57bc8e6 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/TimeDifFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TimeDifFunctionTests.cs @@ -2,10 +2,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Excel.Date; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class TimeDifFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/ToDateTimeFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/ToDateTimeFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Date/ToDateTimeFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/ToDateTimeFunctionTests.cs index 84abd9d..dc870d3 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/ToDateTimeFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/ToDateTimeFunctionTests.cs @@ -5,7 +5,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class ToDateTimeFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/TodayFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TodayFunctionTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/Excel/Date/TodayFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TodayFunctionTests.cs index 3c7b1dd..07bf207 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/TodayFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/TodayFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class TodayFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/WeekDayFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/WeekDayFunctionTests.cs similarity index 92% rename from NoStringEvaluating.Tests/Functions/Excel/Date/WeekDayFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/WeekDayFunctionTests.cs index e0c56a5..e90e091 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/WeekDayFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/WeekDayFunctionTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Functions.Excel.Date; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class WeekDayFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Date/YearFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/YearFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Date/YearFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/YearFunctionTests.cs index 8ffb3e6..c05a0ed 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Date/YearFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Date/YearFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Date; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Date; internal class YearFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/IsErrorFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsErrorFunctionTests.cs similarity index 89% rename from NoStringEvaluating.Tests/Functions/Excel/IsErrorFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsErrorFunctionTests.cs index d620be3..fb4a460 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/IsErrorFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsErrorFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class IsErrorFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/IsMemberFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsMemberFunctionTests.cs similarity index 96% rename from NoStringEvaluating.Tests/Functions/Excel/IsMemberFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsMemberFunctionTests.cs index d479950..28d2f12 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/IsMemberFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsMemberFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class IsMemberFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/IsNumberFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsNumberFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/IsNumberFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsNumberFunctionTests.cs index 5468fbf..9d9affe 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/IsNumberFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/IsNumberFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class IsNumberFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/LenFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/LenFunctionTests.cs similarity index 89% rename from NoStringEvaluating.Tests/Functions/Excel/LenFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/LenFunctionTests.cs index 65af2a3..62c10f9 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/LenFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/LenFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class LenFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/SortFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/SortFunctionTests.cs similarity index 96% rename from NoStringEvaluating.Tests/Functions/Excel/SortFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/SortFunctionTests.cs index 621a430..a827bdf 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/SortFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/SortFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class SortFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/ToNumberFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/ToNumberFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/ToNumberFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/ToNumberFunctionTests.cs index feee167..9a3e505 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/ToNumberFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/ToNumberFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel; internal class ToNumberFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/ConcatFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ConcatFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/ConcatFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ConcatFunctionTests.cs index 8bd0f34..884ded1 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/ConcatFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ConcatFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class ConcatFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/ExplodeFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ExplodeFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/ExplodeFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ExplodeFunctionTests.cs index 51cfbb3..3ba0358 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/ExplodeFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ExplodeFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class ExplodeFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/ImplodeFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ImplodeFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/ImplodeFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ImplodeFunctionTests.cs index 94e41f0..2f765fc 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/ImplodeFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ImplodeFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class ImplodeFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/IsTextFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/IsTextFunctionTests.cs similarity index 93% rename from NoStringEvaluating.Tests/Functions/Excel/Word/IsTextFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/IsTextFunctionTests.cs index cfbe96a..69b2973 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/IsTextFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/IsTextFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class IsTextFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/LeftFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LeftFunctionTests.cs similarity index 97% rename from NoStringEvaluating.Tests/Functions/Excel/Word/LeftFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LeftFunctionTests.cs index 2e28c9c..3f4e454 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/LeftFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LeftFunctionTests.cs @@ -4,7 +4,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class LeftFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/LowerFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LowerFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/LowerFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LowerFunctionTests.cs index 39fe6de..6d52159 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/LowerFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/LowerFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class LowerFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/MiddleFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/MiddleFunctionTests.cs similarity index 97% rename from NoStringEvaluating.Tests/Functions/Excel/Word/MiddleFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/MiddleFunctionTests.cs index 83dc824..dc14269 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/MiddleFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/MiddleFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class MiddleFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/ProperFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ProperFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/ProperFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ProperFunctionTests.cs index f11502b..edba742 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/ProperFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ProperFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class ProperFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/ReplaceFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ReplaceFunctionTests.cs similarity index 95% rename from NoStringEvaluating.Tests/Functions/Excel/Word/ReplaceFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ReplaceFunctionTests.cs index d8573e6..e311938 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/ReplaceFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/ReplaceFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class ReplaceFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/RightFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/RightFunctionTests.cs similarity index 97% rename from NoStringEvaluating.Tests/Functions/Excel/Word/RightFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/RightFunctionTests.cs index d389b1d..91cf2a0 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/RightFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/RightFunctionTests.cs @@ -4,7 +4,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class RightFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/TextFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/TextFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/TextFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/TextFunctionTests.cs index 8b63381..5248340 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/TextFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/TextFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class TextFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/UniqueFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UniqueFunctionTests.cs similarity index 95% rename from NoStringEvaluating.Tests/Functions/Excel/Word/UniqueFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UniqueFunctionTests.cs index 145e94e..32def88 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/UniqueFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UniqueFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class UniqueFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Excel/Word/UpperFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UpperFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Excel/Word/UpperFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UpperFunctionTests.cs index 3189fd1..98bd519 100644 --- a/NoStringEvaluating.Tests/Functions/Excel/Word/UpperFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Excel/Word/UpperFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Excel.Word; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Excel.Word; internal class UpperFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/FunctionIntegrationTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionIntegrationTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/FunctionIntegrationTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionIntegrationTests.cs index 082cad3..4b66408 100644 --- a/NoStringEvaluating.Tests/Functions/FunctionIntegrationTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionIntegrationTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Functions.Base; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions; +namespace NoStringEvaluating.Tests.UnitTests.Functions; internal class FunctionIntegrationTests { diff --git a/NoStringEvaluating.Tests/Functions/FunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/FunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionTests.cs index 6847c93..4515ddc 100644 --- a/NoStringEvaluating.Tests/Functions/FunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/FunctionTests.cs @@ -2,10 +2,10 @@ using AutoFixture; using NoStringEvaluating.Functions.Base; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions; +namespace NoStringEvaluating.Tests.UnitTests.Functions; internal abstract class FunctionTests where TFunction : IFunction, new() diff --git a/NoStringEvaluating.Tests/Functions/Logic/AndFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/AndFunctionTests.cs similarity index 90% rename from NoStringEvaluating.Tests/Functions/Logic/AndFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/AndFunctionTests.cs index 47df27a..f318d9e 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/AndFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/AndFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class AndFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/IfFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IfFunctionTests.cs similarity index 90% rename from NoStringEvaluating.Tests/Functions/Logic/IfFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IfFunctionTests.cs index 46731e4..cf45b2d 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/IfFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IfFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class IfFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/IffFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IffFunctionTests.cs similarity index 94% rename from NoStringEvaluating.Tests/Functions/Logic/IffFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IffFunctionTests.cs index 72e2814..cf7a51e 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/IffFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IffFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class IffFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/IsNanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IsNanFunctionTests.cs similarity index 89% rename from NoStringEvaluating.Tests/Functions/Logic/IsNanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IsNanFunctionTests.cs index 744bfb5..c1d1c72 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/IsNanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/IsNanFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class IsNanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/NotAliasFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotAliasFunctionTests.cs similarity index 91% rename from NoStringEvaluating.Tests/Functions/Logic/NotAliasFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotAliasFunctionTests.cs index 58ed779..f874936 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/NotAliasFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotAliasFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class NotAliasFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/NotFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotFunctionTests.cs similarity index 89% rename from NoStringEvaluating.Tests/Functions/Logic/NotFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotFunctionTests.cs index 344402b..a37c963 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/NotFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/NotFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class NotFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Logic/OrFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/OrFunctionTests.cs similarity index 90% rename from NoStringEvaluating.Tests/Functions/Logic/OrFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/OrFunctionTests.cs index 821d4c0..ce525b9 100644 --- a/NoStringEvaluating.Tests/Functions/Logic/OrFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Logic/OrFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Logic; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Logic; internal class OrFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/AbsFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AbsFunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/AbsFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AbsFunctionTests.cs index 0201bb6..7f5afee 100644 --- a/NoStringEvaluating.Tests/Functions/Math/AbsFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AbsFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class AbsFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/AddFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AddFunctionTests.cs similarity index 83% rename from NoStringEvaluating.Tests/Functions/Math/AddFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AddFunctionTests.cs index adefcac..a148f04 100644 --- a/NoStringEvaluating.Tests/Functions/Math/AddFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/AddFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class AddFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/CeilFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/CeilFunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/CeilFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/CeilFunctionTests.cs index 3e1e4c6..8f1d17f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/CeilFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/CeilFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class CeilFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/FactFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FactFunctionTests.cs similarity index 84% rename from NoStringEvaluating.Tests/Functions/Math/FactFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FactFunctionTests.cs index b76f650..6036e84 100644 --- a/NoStringEvaluating.Tests/Functions/Math/FactFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FactFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class FactFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/FibFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FibFunctionTests.cs similarity index 84% rename from NoStringEvaluating.Tests/Functions/Math/FibFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FibFunctionTests.cs index 61082e7..0ce297e 100644 --- a/NoStringEvaluating.Tests/Functions/Math/FibFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FibFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class FibFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/FloorFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FloorFunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/FloorFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FloorFunctionTests.cs index ebc784a..74e7ace 100644 --- a/NoStringEvaluating.Tests/Functions/Math/FloorFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/FloorFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class FloorFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/GcdFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/GcdFunctionTests.cs similarity index 91% rename from NoStringEvaluating.Tests/Functions/Math/GcdFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/GcdFunctionTests.cs index 4bd4607..fcabc8f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/GcdFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/GcdFunctionTests.cs @@ -2,10 +2,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class GcdFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/LcmFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LcmFunctionTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Functions/Math/LcmFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LcmFunctionTests.cs index dcd97d9..70e8d34 100644 --- a/NoStringEvaluating.Tests/Functions/Math/LcmFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LcmFunctionTests.cs @@ -2,10 +2,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class LcmFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/LnFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LnFunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/LnFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LnFunctionTests.cs index c5bf1f9..6c70e2f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/LnFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LnFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class LnFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Log10FunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log10FunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/Log10FunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log10FunctionTests.cs index f1b6831..f370e81 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Log10FunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log10FunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class Log10FunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Log2FunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log2FunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/Log2FunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log2FunctionTests.cs index ba846e1..33f6106 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Log2FunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Log2FunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class Log2FunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/LogFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LogFunctionTests.cs similarity index 82% rename from NoStringEvaluating.Tests/Functions/Math/LogFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LogFunctionTests.cs index 498f1ed..34a22ec 100644 --- a/NoStringEvaluating.Tests/Functions/Math/LogFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/LogFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class LogFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/MaxFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MaxFunctionTests.cs similarity index 83% rename from NoStringEvaluating.Tests/Functions/Math/MaxFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MaxFunctionTests.cs index b570f35..363c26b 100644 --- a/NoStringEvaluating.Tests/Functions/Math/MaxFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MaxFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class MaxFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/MeanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MeanFunctionTests.cs similarity index 84% rename from NoStringEvaluating.Tests/Functions/Math/MeanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MeanFunctionTests.cs index 8dbef88..6786382 100644 --- a/NoStringEvaluating.Tests/Functions/Math/MeanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MeanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class MeanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/MinFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MinFunctionTests.cs similarity index 83% rename from NoStringEvaluating.Tests/Functions/Math/MinFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MinFunctionTests.cs index 368211c..40d6bd2 100644 --- a/NoStringEvaluating.Tests/Functions/Math/MinFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MinFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class MinFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/ModFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/ModFunctionTests.cs similarity index 81% rename from NoStringEvaluating.Tests/Functions/Math/ModFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/ModFunctionTests.cs index 3306908..32d75b9 100644 --- a/NoStringEvaluating.Tests/Functions/Math/ModFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/ModFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class ModFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/MultiFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MultiFunctionTests.cs similarity index 84% rename from NoStringEvaluating.Tests/Functions/Math/MultiFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MultiFunctionTests.cs index 91c9e93..f99e977 100644 --- a/NoStringEvaluating.Tests/Functions/Math/MultiFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/MultiFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class MultiFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/RoundFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/RoundFunctionTests.cs similarity index 82% rename from NoStringEvaluating.Tests/Functions/Math/RoundFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/RoundFunctionTests.cs index 9ab9ed8..69ce846 100644 --- a/NoStringEvaluating.Tests/Functions/Math/RoundFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/RoundFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class RoundFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/SgnFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SgnFunctionTests.cs similarity index 82% rename from NoStringEvaluating.Tests/Functions/Math/SgnFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SgnFunctionTests.cs index 8675b31..541c187 100644 --- a/NoStringEvaluating.Tests/Functions/Math/SgnFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SgnFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class SgnFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/SignFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SignFunctionTests.cs similarity index 82% rename from NoStringEvaluating.Tests/Functions/Math/SignFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SignFunctionTests.cs index 60b3228..bb6bc9f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/SignFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SignFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class SignFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/SqrtFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SqrtFunctionTests.cs similarity index 82% rename from NoStringEvaluating.Tests/Functions/Math/SqrtFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SqrtFunctionTests.cs index b242484..54df05a 100644 --- a/NoStringEvaluating.Tests/Functions/Math/SqrtFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/SqrtFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math; internal class SqrtFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs index 0a714b8..d4bd968 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcosFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class AcosFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs index 7bab40e..ccfbee7 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/AcoshFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class AcoshFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs index 94e8f35..ebd8152 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccosFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class ArccosFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs index 969099d..01fe439 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArccoshFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class ArccoshFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs index 303a610..322bc49 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcosFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class ArcosFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs index 3c6d51d..516b25b 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/ArcoshFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class ArcoshFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs index 1b927db..62f5615 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CosFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class CosFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs index 1e3a615..778a5ba 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cos/CoshFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cos; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cos; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cos; internal class CoshFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs index 8702c8f..09a26a2 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcosechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class AcosechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs index 1b7ee36..a970bc4 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/AcschFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class AcschFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs index 8a0a8b9..0b5b56d 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArccschFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class ArccschFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs index b7f5b22..ff4e6da 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcosechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class ArcosechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs index 7c4a6a8..f0d894f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/ArcschFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class ArcschFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs index c04a8bf..8e8320d 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosecFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class CosecFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs index 99b718d..4675783 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CosechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class CosechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs index 1cbd0bf..83d4367 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CscFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class CscFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs index b5b4aa3..eb37795 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cosec/CschFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cosec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cosec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cosec; internal class CschFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs index a75029e..494e541 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcotFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class AcotFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs index 10d10b1..faf5ed3 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/AcothFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class AcothFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs index 4cfea49..4af077e 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ActanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs index cb2c9b4..7948377 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ActanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs index 7931dda..67d0eab 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ActgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs index be990c5..21f647f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ActghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ActghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs index 26b883b..363aaa2 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccotFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArccotFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs index fb34fc7..5c55431 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArccothFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArccothFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs index de6c9aa..a292f8f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArcctanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs index ee86540..5181665 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArcctanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs index a0d9446..2ace3a1 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArcctgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs index 27fab59..470987b 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/ArcctghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class ArcctghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs index aa012a2..2960d1f 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CotFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CotFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs index a00f3b3..b30f2dd 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CothFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CothFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs index e14271f..c65d824 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CtanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs index e469da9..5942b97 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CtanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs index 417daa8..96b85e9 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CtgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs index 5945ade..eea1dd7 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Cotan/CtghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Cotan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Cotan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Cotan; internal class CtghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/DegFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/DegFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/DegFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/DegFunctionTests.cs index f928299..b5ec7ac 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/DegFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/DegFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry; internal class DegFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/ExpFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/ExpFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/ExpFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/ExpFunctionTests.cs index ef82614..46c303b 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/ExpFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/ExpFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry; internal class ExpFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/RadFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/RadFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/RadFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/RadFunctionTests.cs index f89e511..4300ce4 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/RadFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/RadFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry; internal class RadFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs index 26e065e..c2f8d36 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsecFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class ArcsecFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs index 8f802dc..5bb9c69 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArcsechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class ArcsechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs index b82810e..71a5c7c 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/ArsechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class ArsechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs index 712c2a2..4ea0b13 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/AsechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class AsechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs index 1fc8771..2cedd25 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SecFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class SecFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs index cb797f7..e087553 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sec/SechFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sec; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sec; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sec; internal class SechFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs index c3f8f5d..190679a 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class ArcsinFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs index 4b86cac..21a70a8 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArcsinhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class ArcsinhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs index 6cae791..ffa993e 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class ArsinFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs index e99c830..ccb38c1 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/ArsinhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class ArsinhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs index ba4559e..6e5ebd7 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class AsinFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs index ab29c0e..33229e8 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/AsinhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class AsinhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs index a812593..bf71068 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class SinFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs index 81bd75e..1724c62 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Sin/SinhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Sin; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Sin; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Sin; internal class SinhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs index 4c37b23..4cb0c1c 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class ArctanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs index 0c44c6a..376e4a1 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class ArctanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs index 99d69cf..8612edc 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class ArctgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs index 0e66ee8..f766764 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/ArctghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class ArctghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs index b9f466d..00f56e5 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class AtanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs index 3e37c4e..fe42cc2 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class AtanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs index f9b5135..481a435 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class AtgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs index 02b7b03..6618ffe 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/AtghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class AtghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs index 4b3735a..29c9494 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class TanFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs index 1d34205..aca6d10 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TanhFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class TanhFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs similarity index 79% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs index fc2bc23..268c237 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TgFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class TgFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs similarity index 80% rename from NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs index 3607010..e4d1971 100644 --- a/NoStringEvaluating.Tests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Math/Trigonometry/Tan/TghFunctionTests.cs @@ -1,10 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Functions.Math.Trigonometry.Tan; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Math.Trigonometry.Tan; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Math.Trigonometry.Tan; internal class TghFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Null/IfNullFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IfNullFunctionTests.cs similarity index 92% rename from NoStringEvaluating.Tests/Functions/Null/IfNullFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IfNullFunctionTests.cs index 5725d3b..4137c2a 100644 --- a/NoStringEvaluating.Tests/Functions/Null/IfNullFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IfNullFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Null; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Null; internal class IfNullFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Null/IsNullFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IsNullFunctionTests.cs similarity index 92% rename from NoStringEvaluating.Tests/Functions/Null/IsNullFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IsNullFunctionTests.cs index b90311f..00fd328 100644 --- a/NoStringEvaluating.Tests/Functions/Null/IsNullFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/IsNullFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Null; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Null; internal class IsNullFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Functions/Null/NullIfFunctionTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/NullIfFunctionTests.cs similarity index 92% rename from NoStringEvaluating.Tests/Functions/Null/NullIfFunctionTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Functions/Null/NullIfFunctionTests.cs index 88f2c17..723aa98 100644 --- a/NoStringEvaluating.Tests/Functions/Null/NullIfFunctionTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Functions/Null/NullIfFunctionTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Functions.Null; +namespace NoStringEvaluating.Tests.UnitTests.Functions.Null; internal class NullIfFunctionTests : FunctionTests { diff --git a/NoStringEvaluating.Tests/Helpers/EvaluatorFacadeFactory.cs b/src/NoStringEvaluating.Tests/UnitTests/Helpers/EvaluatorFacadeFactory.cs similarity index 96% rename from NoStringEvaluating.Tests/Helpers/EvaluatorFacadeFactory.cs rename to src/NoStringEvaluating.Tests/UnitTests/Helpers/EvaluatorFacadeFactory.cs index b603cd4..0355b7d 100644 --- a/NoStringEvaluating.Tests/Helpers/EvaluatorFacadeFactory.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Helpers/EvaluatorFacadeFactory.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Models; using NoStringEvaluating.Models.Values; -namespace NoStringEvaluating.Tests.Helpers; +namespace NoStringEvaluating.Tests.UnitTests.Helpers; internal static class EvaluatorFacadeFactory { diff --git a/NoStringEvaluating.Tests/Helpers/Extensions.cs b/src/NoStringEvaluating.Tests/UnitTests/Helpers/Extensions.cs similarity index 89% rename from NoStringEvaluating.Tests/Helpers/Extensions.cs rename to src/NoStringEvaluating.Tests/UnitTests/Helpers/Extensions.cs index eeebb81..891e056 100644 --- a/NoStringEvaluating.Tests/Helpers/Extensions.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Helpers/Extensions.cs @@ -1,7 +1,7 @@ using FluentAssertions; using FluentAssertions.Numeric; -namespace NoStringEvaluating.Tests.Helpers; +namespace NoStringEvaluating.Tests.UnitTests.Helpers; internal static class Extensions { diff --git a/src/NoStringEvaluating.Tests/UnitTests/Helpers/FormulaModelFactory.cs b/src/NoStringEvaluating.Tests/UnitTests/Helpers/FormulaModelFactory.cs new file mode 100644 index 0000000..fa1a0d0 --- /dev/null +++ b/src/NoStringEvaluating.Tests/UnitTests/Helpers/FormulaModelFactory.cs @@ -0,0 +1,28 @@ +using NoStringEvaluating.Models.Values; + +namespace NoStringEvaluating.Tests.UnitTests.Helpers; + +internal static class FormulaModelFactory +{ + public static Models.FormulaModel CreateTestModelToCheck(string formula, bool expectedOkresult) + { + var model = new Models.FormulaModel(formula, "NULL", double.NaN, expectedOkresult); + return model; + } + + public static Models.FormulaModel CreateTestModel(string formula, EvaluatorValue result, params (string, EvaluatorValue)[] arguments) + { + return CreateTestModel(formula, "NULL", result, arguments); + } + + public static Models.FormulaModel CreateTestModel(string formula, string parsedFormula, EvaluatorValue result, params (string, EvaluatorValue)[] arguments) + { + var model = new Models.FormulaModel(formula, parsedFormula, result); + foreach (var argument in arguments) + { + model.Arguments[argument.Item1] = argument.Item2; + } + + return model; + } +} diff --git a/NoStringEvaluating.Tests/Helpers/InternalValueFactory.cs b/src/NoStringEvaluating.Tests/UnitTests/Helpers/InternalValueFactory.cs similarity index 90% rename from NoStringEvaluating.Tests/Helpers/InternalValueFactory.cs rename to src/NoStringEvaluating.Tests/UnitTests/Helpers/InternalValueFactory.cs index 50b7cbe..ad7309c 100644 --- a/NoStringEvaluating.Tests/Helpers/InternalValueFactory.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Helpers/InternalValueFactory.cs @@ -1,7 +1,7 @@ using NoStringEvaluating.Factories; using NoStringEvaluating.Models.Values; -namespace NoStringEvaluating.Tests.Helpers; +namespace NoStringEvaluating.Tests.UnitTests.Helpers; internal class InternalValueFactory { diff --git a/NoStringEvaluating.Tests/Helpers/VariablesContainer.cs b/src/NoStringEvaluating.Tests/UnitTests/Helpers/VariablesContainer.cs similarity index 94% rename from NoStringEvaluating.Tests/Helpers/VariablesContainer.cs rename to src/NoStringEvaluating.Tests/UnitTests/Helpers/VariablesContainer.cs index 40e94f2..b6b97c1 100644 --- a/NoStringEvaluating.Tests/Helpers/VariablesContainer.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Helpers/VariablesContainer.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Contract.Variables; using NoStringEvaluating.Models.Values; -namespace NoStringEvaluating.Tests.Helpers; +namespace NoStringEvaluating.Tests.UnitTests.Helpers; internal class VariablesContainer : IVariablesContainer { diff --git a/src/NoStringEvaluating.Tests/UnitTests/Models/FormulaModel.cs b/src/NoStringEvaluating.Tests/UnitTests/Models/FormulaModel.cs new file mode 100644 index 0000000..77ce343 --- /dev/null +++ b/src/NoStringEvaluating.Tests/UnitTests/Models/FormulaModel.cs @@ -0,0 +1,21 @@ +using NoStringEvaluating.Models.Values; + +namespace NoStringEvaluating.Tests.UnitTests.Models; + +public class FormulaModel(string formula, string parsedFormula, EvaluatorValue result, bool expectedOkResult = true) +{ + public string Formula { get; } = formula; + + public string ParsedFormula { get; } = parsedFormula; + + public EvaluatorValue Result { get; } = result; + + public bool ExpectedOkResult { get; } = expectedOkResult; + + public Dictionary Arguments { get; } = []; + + public override string ToString() + { + return Formula; + } +} diff --git a/NoStringEvaluating.Tests/Models/Values/EvaluatorValueTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Models/Values/EvaluatorValueTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Models/Values/EvaluatorValueTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Models/Values/EvaluatorValueTests.cs index 60c1c88..13393f2 100644 --- a/NoStringEvaluating.Tests/Models/Values/EvaluatorValueTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Models/Values/EvaluatorValueTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Models.Values; +namespace NoStringEvaluating.Tests.UnitTests.Models.Values; internal class EvaluatorValueTests { diff --git a/NoStringEvaluating.Tests/Models/Values/InternalEvaluatorValueTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Models/Values/InternalEvaluatorValueTests.cs similarity index 88% rename from NoStringEvaluating.Tests/Models/Values/InternalEvaluatorValueTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Models/Values/InternalEvaluatorValueTests.cs index b3eb360..a81c59a 100644 --- a/NoStringEvaluating.Tests/Models/Values/InternalEvaluatorValueTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Models/Values/InternalEvaluatorValueTests.cs @@ -2,7 +2,7 @@ using NoStringEvaluating.Models.Values; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Models.Values; +namespace NoStringEvaluating.Tests.UnitTests.Models.Values; internal class InternalEvaluatorValueTests { diff --git a/NoStringEvaluating.Tests/NoStringEvaluatorNullableTests.cs b/src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorNullableTests.cs similarity index 95% rename from NoStringEvaluating.Tests/NoStringEvaluatorNullableTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorNullableTests.cs index 4a41b31..9609c78 100644 --- a/NoStringEvaluating.Tests/NoStringEvaluatorNullableTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorNullableTests.cs @@ -1,10 +1,10 @@ using AutoFixture; using FluentAssertions; using NoStringEvaluating.Models.Values; -using NoStringEvaluating.Tests.Helpers; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests; +namespace NoStringEvaluating.Tests.UnitTests; internal class NoStringEvaluatorNullableTests { diff --git a/NoStringEvaluating.Tests/NoStringEvaluatorTests.cs b/src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorTests.cs similarity index 94% rename from NoStringEvaluating.Tests/NoStringEvaluatorTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorTests.cs index 951b63a..fa3fa79 100644 --- a/NoStringEvaluating.Tests/NoStringEvaluatorTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/NoStringEvaluatorTests.cs @@ -6,17 +6,17 @@ using NoStringEvaluating.Functions.Base; using NoStringEvaluating.Models.Values; using NoStringEvaluating.Services.Parsing; -using NoStringEvaluating.Tests.Data; -using NoStringEvaluating.Tests.Helpers; -using NoStringEvaluating.Tests.Models; +using NoStringEvaluating.Tests.UnitTests.Data; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests; +namespace NoStringEvaluating.Tests.UnitTests; +[UnconditionalSuppressMessage("Style", "IDE0059:Unnecessary assignment of a value")] internal class NoStringEvaluatorTests { [TestCaseSource(typeof(EvaluateNumber), nameof(EvaluateNumber.Get))] - public void Should_Evaluate_Number(FormulaModel model) + public void Should_Evaluate_Number(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcNumber(model.Formula, model.Arguments); @@ -26,7 +26,7 @@ public void Should_Evaluate_Number(FormulaModel model) } [TestCaseSource(typeof(EvaluateWord), nameof(EvaluateWord.Get))] - public void Should_Evaluate_Word(FormulaModel model) + public void Should_Evaluate_Word(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcWord(model.Formula, model.Arguments); @@ -36,7 +36,7 @@ public void Should_Evaluate_Word(FormulaModel model) } [TestCaseSource(typeof(EvaluateDateTime), nameof(EvaluateDateTime.Get))] - public void Should_Evaluate_DateTime(FormulaModel model) + public void Should_Evaluate_DateTime(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcDateTime(model.Formula, model.Arguments); @@ -46,7 +46,7 @@ public void Should_Evaluate_DateTime(FormulaModel model) } [TestCaseSource(typeof(EvaluateWordList), nameof(EvaluateWordList.Get))] - public void Should_Evaluate_WordList(FormulaModel model) + public void Should_Evaluate_WordList(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcWordList(model.Formula, model.Arguments); @@ -56,7 +56,7 @@ public void Should_Evaluate_WordList(FormulaModel model) } [TestCaseSource(typeof(EvaluateNumberList), nameof(EvaluateNumberList.Get))] - public void Should_Evaluate_NumberList(FormulaModel model) + public void Should_Evaluate_NumberList(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcNumberList(model.Formula, model.Arguments); @@ -66,7 +66,7 @@ public void Should_Evaluate_NumberList(FormulaModel model) } [TestCaseSource(typeof(EvaluateBoolean), nameof(EvaluateBoolean.Get))] - public void Should_Evaluate_Boolean(FormulaModel model) + public void Should_Evaluate_Boolean(Models.FormulaModel model) { // arrange, act var actual = CreateService().CalcBoolean(model.Formula, model.Arguments); @@ -248,6 +248,7 @@ public void Should_Return_DateTime() } [Test] + [UnconditionalSuppressMessage("Performance", "CA1861:Avoid constant arrays as arguments")] public void Should_Return_WordList() { // arrange @@ -451,7 +452,7 @@ private static void TestNodes(string formula, ValueTypeKey expectedValueType) res.TypeKey.Should().Be(expectedValueType); } - private static IVariablesContainer CreateVariablesContainer(params (string, EvaluatorValue)[] variables) + private static VariablesContainer CreateVariablesContainer(params (string, EvaluatorValue)[] variables) { var variableContainer = new VariablesContainer(); @@ -463,7 +464,7 @@ private static IVariablesContainer CreateVariablesContainer(params (string, Eval return variableContainer; } - private static IDictionary CreateVariablesDictionary(params (string, EvaluatorValue)[] variables) + private static Dictionary CreateVariablesDictionary(params (string, EvaluatorValue)[] variables) { return variables.ToDictionary(key => key.Item1, val => val.Item2); } diff --git a/NoStringEvaluating.Tests/Services/Checking/FormulaCheckerTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Services/Checking/FormulaCheckerTests.cs similarity index 71% rename from NoStringEvaluating.Tests/Services/Checking/FormulaCheckerTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Services/Checking/FormulaCheckerTests.cs index 5d3389d..36731da 100644 --- a/NoStringEvaluating.Tests/Services/Checking/FormulaCheckerTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Services/Checking/FormulaCheckerTests.cs @@ -1,11 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Services.Checking; -using NoStringEvaluating.Tests.Data; -using NoStringEvaluating.Tests.Helpers; -using NoStringEvaluating.Tests.Models; +using NoStringEvaluating.Tests.UnitTests.Data; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Services.Checking; +namespace NoStringEvaluating.Tests.UnitTests.Services.Checking; internal class FormulaCheckerTests { @@ -18,7 +17,7 @@ public void Setup() } [TestCaseSource(typeof(CheckFormula), nameof(CheckFormula.Get))] - public void Should_Check_Syntax(FormulaModel model) + public void Should_Check_Syntax(Models.FormulaModel model) { // arrange, act var actual = _service.CheckSyntax(model.Formula); diff --git a/NoStringEvaluating.Tests/Services/OperationProcessorTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Services/OperationProcessorTests.cs similarity index 99% rename from NoStringEvaluating.Tests/Services/OperationProcessorTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Services/OperationProcessorTests.cs index 6d88254..f59cdf7 100644 --- a/NoStringEvaluating.Tests/Services/OperationProcessorTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Services/OperationProcessorTests.cs @@ -4,7 +4,7 @@ using NoStringEvaluating.Services; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Services; +namespace NoStringEvaluating.Tests.UnitTests.Services; internal class OperationProcessorTests { diff --git a/NoStringEvaluating.Tests/Services/Parsing/FormulaParserTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Services/Parsing/FormulaParserTests.cs similarity index 69% rename from NoStringEvaluating.Tests/Services/Parsing/FormulaParserTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Services/Parsing/FormulaParserTests.cs index a8c2393..cad32b4 100644 --- a/NoStringEvaluating.Tests/Services/Parsing/FormulaParserTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Services/Parsing/FormulaParserTests.cs @@ -1,11 +1,10 @@ using FluentAssertions; using NoStringEvaluating.Services.Parsing; -using NoStringEvaluating.Tests.Data; -using NoStringEvaluating.Tests.Helpers; -using NoStringEvaluating.Tests.Models; +using NoStringEvaluating.Tests.UnitTests.Data; +using NoStringEvaluating.Tests.UnitTests.Helpers; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Services.Parsing; +namespace NoStringEvaluating.Tests.UnitTests.Services.Parsing; internal class FormulaParserTests { @@ -18,7 +17,7 @@ public void Setup() } [TestCaseSource(typeof(ParseFormula), nameof(ParseFormula.Get))] - public void Should_Parse_Formula(FormulaModel model) + public void Should_Parse_Formula(Models.FormulaModel model) { // arrange, act var actual = _service.Parse(model.Formula); diff --git a/NoStringEvaluating.Tests/Services/Value/WordFormatterTests.cs b/src/NoStringEvaluating.Tests/UnitTests/Services/Value/WordFormatterTests.cs similarity index 96% rename from NoStringEvaluating.Tests/Services/Value/WordFormatterTests.cs rename to src/NoStringEvaluating.Tests/UnitTests/Services/Value/WordFormatterTests.cs index 024a587..6c9c42f 100644 --- a/NoStringEvaluating.Tests/Services/Value/WordFormatterTests.cs +++ b/src/NoStringEvaluating.Tests/UnitTests/Services/Value/WordFormatterTests.cs @@ -3,7 +3,7 @@ using NoStringEvaluating.Services.Value; using NUnit.Framework; -namespace NoStringEvaluating.Tests.Services.Value; +namespace NoStringEvaluating.Tests.UnitTests.Services.Value; internal class WordFormatterTests { diff --git a/NoStringEvaluating/Contract/IFormulaCache.cs b/src/NoStringEvaluating/Contract/IFormulaCache.cs similarity index 100% rename from NoStringEvaluating/Contract/IFormulaCache.cs rename to src/NoStringEvaluating/Contract/IFormulaCache.cs diff --git a/NoStringEvaluating/Contract/IFormulaChecker.cs b/src/NoStringEvaluating/Contract/IFormulaChecker.cs similarity index 100% rename from NoStringEvaluating/Contract/IFormulaChecker.cs rename to src/NoStringEvaluating/Contract/IFormulaChecker.cs diff --git a/NoStringEvaluating/Contract/IFormulaParser.cs b/src/NoStringEvaluating/Contract/IFormulaParser.cs similarity index 100% rename from NoStringEvaluating/Contract/IFormulaParser.cs rename to src/NoStringEvaluating/Contract/IFormulaParser.cs diff --git a/NoStringEvaluating/Contract/IFunctionReader.cs b/src/NoStringEvaluating/Contract/IFunctionReader.cs similarity index 100% rename from NoStringEvaluating/Contract/IFunctionReader.cs rename to src/NoStringEvaluating/Contract/IFunctionReader.cs diff --git a/NoStringEvaluating/Contract/INoStringEvaluator.cs b/src/NoStringEvaluating/Contract/INoStringEvaluator.cs similarity index 100% rename from NoStringEvaluating/Contract/INoStringEvaluator.cs rename to src/NoStringEvaluating/Contract/INoStringEvaluator.cs diff --git a/NoStringEvaluating/Contract/INoStringEvaluatorNullable.cs b/src/NoStringEvaluating/Contract/INoStringEvaluatorNullable.cs similarity index 100% rename from NoStringEvaluating/Contract/INoStringEvaluatorNullable.cs rename to src/NoStringEvaluating/Contract/INoStringEvaluatorNullable.cs diff --git a/NoStringEvaluating/Contract/Variables/IVariable.cs b/src/NoStringEvaluating/Contract/Variables/IVariable.cs similarity index 100% rename from NoStringEvaluating/Contract/Variables/IVariable.cs rename to src/NoStringEvaluating/Contract/Variables/IVariable.cs diff --git a/NoStringEvaluating/Contract/Variables/IVariablesContainer.cs b/src/NoStringEvaluating/Contract/Variables/IVariablesContainer.cs similarity index 100% rename from NoStringEvaluating/Contract/Variables/IVariablesContainer.cs rename to src/NoStringEvaluating/Contract/Variables/IVariablesContainer.cs diff --git a/src/NoStringEvaluating/Exceptions/NoStringFunctionException.cs b/src/NoStringEvaluating/Exceptions/NoStringFunctionException.cs new file mode 100644 index 0000000..7e4b08b --- /dev/null +++ b/src/NoStringEvaluating/Exceptions/NoStringFunctionException.cs @@ -0,0 +1,8 @@ +namespace NoStringEvaluating.Exceptions; + +/// +/// Raises when function exception +/// +public class NoStringFunctionException(string funcName) : Exception($"Function \"{funcName}\" has already added") +{ +} diff --git a/src/NoStringEvaluating/Exceptions/VariableNotFoundException.cs b/src/NoStringEvaluating/Exceptions/VariableNotFoundException.cs new file mode 100644 index 0000000..7c728e7 --- /dev/null +++ b/src/NoStringEvaluating/Exceptions/VariableNotFoundException.cs @@ -0,0 +1,12 @@ +namespace NoStringEvaluating.Exceptions; + +/// +/// Raises when can't find a variable +/// +public class VariableNotFoundException(string variableName, string message) : Exception(message) +{ + /// + /// VariableName + /// + public string VariableName { get; set; } = variableName; +} diff --git a/NoStringEvaluating/Extensions/InternalExtensions.cs b/src/NoStringEvaluating/Extensions/InternalExtensions.cs similarity index 100% rename from NoStringEvaluating/Extensions/InternalExtensions.cs rename to src/NoStringEvaluating/Extensions/InternalExtensions.cs diff --git a/NoStringEvaluating/Extensions/NoStringEvaluatorExtensions.cs b/src/NoStringEvaluating/Extensions/NoStringEvaluatorExtensions.cs similarity index 100% rename from NoStringEvaluating/Extensions/NoStringEvaluatorExtensions.cs rename to src/NoStringEvaluating/Extensions/NoStringEvaluatorExtensions.cs diff --git a/NoStringEvaluating/Extensions/NumberExtensions.cs b/src/NoStringEvaluating/Extensions/NumberExtensions.cs similarity index 100% rename from NoStringEvaluating/Extensions/NumberExtensions.cs rename to src/NoStringEvaluating/Extensions/NumberExtensions.cs diff --git a/NoStringEvaluating/Factories/BooleanFactory.cs b/src/NoStringEvaluating/Factories/BooleanFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/BooleanFactory.cs rename to src/NoStringEvaluating/Factories/BooleanFactory.cs diff --git a/NoStringEvaluating/Factories/DateTimeFactory.cs b/src/NoStringEvaluating/Factories/DateTimeFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/DateTimeFactory.cs rename to src/NoStringEvaluating/Factories/DateTimeFactory.cs diff --git a/NoStringEvaluating/Factories/NumberListFactory.cs b/src/NoStringEvaluating/Factories/NumberListFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/NumberListFactory.cs rename to src/NoStringEvaluating/Factories/NumberListFactory.cs diff --git a/NoStringEvaluating/Factories/ObjectFactory.cs b/src/NoStringEvaluating/Factories/ObjectFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/ObjectFactory.cs rename to src/NoStringEvaluating/Factories/ObjectFactory.cs diff --git a/NoStringEvaluating/Factories/ValueFactory.cs b/src/NoStringEvaluating/Factories/ValueFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/ValueFactory.cs rename to src/NoStringEvaluating/Factories/ValueFactory.cs diff --git a/NoStringEvaluating/Factories/WordFactory.cs b/src/NoStringEvaluating/Factories/WordFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/WordFactory.cs rename to src/NoStringEvaluating/Factories/WordFactory.cs diff --git a/NoStringEvaluating/Factories/WordListFactory.cs b/src/NoStringEvaluating/Factories/WordListFactory.cs similarity index 100% rename from NoStringEvaluating/Factories/WordListFactory.cs rename to src/NoStringEvaluating/Factories/WordListFactory.cs diff --git a/NoStringEvaluating/Functions/Base/IFunction.cs b/src/NoStringEvaluating/Functions/Base/IFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Base/IFunction.cs rename to src/NoStringEvaluating/Functions/Base/IFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/CountFunction.cs b/src/NoStringEvaluating/Functions/Excel/CountFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/CountFunction.cs rename to src/NoStringEvaluating/Functions/Excel/CountFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/AddHoursFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/AddHoursFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/AddHoursFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/AddHoursFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/AddMinutesFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/AddMinutesFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/AddMinutesFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/AddMinutesFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/AddSecondsFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/AddSecondsFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/AddSecondsFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/AddSecondsFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/DateDifFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/DateDifFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/DateDifFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/DateDifFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/DateFormatFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/DateFormatFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/DateFormatFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/DateFormatFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/DayFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/DayFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/DayFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/DayFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/MonthFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/MonthFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/MonthFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/MonthFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/NowFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/NowFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/NowFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/NowFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/TimeDifFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/TimeDifFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/TimeDifFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/TimeDifFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/ToDateTimeFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/ToDateTimeFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/ToDateTimeFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/ToDateTimeFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/TodayFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/TodayFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/TodayFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/TodayFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/WeekDayFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/WeekDayFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/WeekDayFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/WeekDayFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Date/YearFunction.cs b/src/NoStringEvaluating/Functions/Excel/Date/YearFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Date/YearFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Date/YearFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/IsErrorFunction.cs b/src/NoStringEvaluating/Functions/Excel/IsErrorFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/IsErrorFunction.cs rename to src/NoStringEvaluating/Functions/Excel/IsErrorFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/IsMemberFunction.cs b/src/NoStringEvaluating/Functions/Excel/IsMemberFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/IsMemberFunction.cs rename to src/NoStringEvaluating/Functions/Excel/IsMemberFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/IsNumberFunction.cs b/src/NoStringEvaluating/Functions/Excel/IsNumberFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/IsNumberFunction.cs rename to src/NoStringEvaluating/Functions/Excel/IsNumberFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/LenFunction.cs b/src/NoStringEvaluating/Functions/Excel/LenFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/LenFunction.cs rename to src/NoStringEvaluating/Functions/Excel/LenFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/SortFunction.cs b/src/NoStringEvaluating/Functions/Excel/SortFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/SortFunction.cs rename to src/NoStringEvaluating/Functions/Excel/SortFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/ToNumberFunction.cs b/src/NoStringEvaluating/Functions/Excel/ToNumberFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/ToNumberFunction.cs rename to src/NoStringEvaluating/Functions/Excel/ToNumberFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/ConcatFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/ConcatFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/ConcatFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/ConcatFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/ExplodeFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/ExplodeFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/ExplodeFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/ExplodeFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/ImplodeFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/ImplodeFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/ImplodeFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/ImplodeFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/IsTextFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/IsTextFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/IsTextFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/IsTextFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/LeftFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/LeftFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/LeftFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/LeftFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/LowerFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/LowerFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/LowerFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/LowerFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/MiddleFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/MiddleFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/MiddleFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/MiddleFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/ProperFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/ProperFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/ProperFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/ProperFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/ReplaceFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/ReplaceFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/ReplaceFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/ReplaceFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/RightFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/RightFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/RightFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/RightFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/TextFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/TextFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/TextFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/TextFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/UniqueFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/UniqueFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/UniqueFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/UniqueFunction.cs diff --git a/NoStringEvaluating/Functions/Excel/Word/UpperFunction.cs b/src/NoStringEvaluating/Functions/Excel/Word/UpperFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Excel/Word/UpperFunction.cs rename to src/NoStringEvaluating/Functions/Excel/Word/UpperFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/AndFunction.cs b/src/NoStringEvaluating/Functions/Logic/AndFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/AndFunction.cs rename to src/NoStringEvaluating/Functions/Logic/AndFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/IfFunction.cs b/src/NoStringEvaluating/Functions/Logic/IfFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/IfFunction.cs rename to src/NoStringEvaluating/Functions/Logic/IfFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/IffFunction.cs b/src/NoStringEvaluating/Functions/Logic/IffFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/IffFunction.cs rename to src/NoStringEvaluating/Functions/Logic/IffFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/IsnanFunction.cs b/src/NoStringEvaluating/Functions/Logic/IsnanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/IsnanFunction.cs rename to src/NoStringEvaluating/Functions/Logic/IsnanFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/NotAliasFunction.cs b/src/NoStringEvaluating/Functions/Logic/NotAliasFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/NotAliasFunction.cs rename to src/NoStringEvaluating/Functions/Logic/NotAliasFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/NotFunction.cs b/src/NoStringEvaluating/Functions/Logic/NotFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/NotFunction.cs rename to src/NoStringEvaluating/Functions/Logic/NotFunction.cs diff --git a/NoStringEvaluating/Functions/Logic/OrFunction.cs b/src/NoStringEvaluating/Functions/Logic/OrFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Logic/OrFunction.cs rename to src/NoStringEvaluating/Functions/Logic/OrFunction.cs diff --git a/NoStringEvaluating/Functions/Math/AbsFunction.cs b/src/NoStringEvaluating/Functions/Math/AbsFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/AbsFunction.cs rename to src/NoStringEvaluating/Functions/Math/AbsFunction.cs diff --git a/NoStringEvaluating/Functions/Math/AddFunction.cs b/src/NoStringEvaluating/Functions/Math/AddFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/AddFunction.cs rename to src/NoStringEvaluating/Functions/Math/AddFunction.cs diff --git a/NoStringEvaluating/Functions/Math/CeilFunction.cs b/src/NoStringEvaluating/Functions/Math/CeilFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/CeilFunction.cs rename to src/NoStringEvaluating/Functions/Math/CeilFunction.cs diff --git a/NoStringEvaluating/Functions/Math/FactFunction.cs b/src/NoStringEvaluating/Functions/Math/FactFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/FactFunction.cs rename to src/NoStringEvaluating/Functions/Math/FactFunction.cs diff --git a/NoStringEvaluating/Functions/Math/FibFunction.cs b/src/NoStringEvaluating/Functions/Math/FibFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/FibFunction.cs rename to src/NoStringEvaluating/Functions/Math/FibFunction.cs diff --git a/NoStringEvaluating/Functions/Math/FloorFunction.cs b/src/NoStringEvaluating/Functions/Math/FloorFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/FloorFunction.cs rename to src/NoStringEvaluating/Functions/Math/FloorFunction.cs diff --git a/NoStringEvaluating/Functions/Math/GcdFunction.cs b/src/NoStringEvaluating/Functions/Math/GcdFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/GcdFunction.cs rename to src/NoStringEvaluating/Functions/Math/GcdFunction.cs diff --git a/NoStringEvaluating/Functions/Math/LcmFunction.cs b/src/NoStringEvaluating/Functions/Math/LcmFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/LcmFunction.cs rename to src/NoStringEvaluating/Functions/Math/LcmFunction.cs diff --git a/NoStringEvaluating/Functions/Math/LnFunction.cs b/src/NoStringEvaluating/Functions/Math/LnFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/LnFunction.cs rename to src/NoStringEvaluating/Functions/Math/LnFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Log10Function.cs b/src/NoStringEvaluating/Functions/Math/Log10Function.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Log10Function.cs rename to src/NoStringEvaluating/Functions/Math/Log10Function.cs diff --git a/NoStringEvaluating/Functions/Math/Log2Function.cs b/src/NoStringEvaluating/Functions/Math/Log2Function.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Log2Function.cs rename to src/NoStringEvaluating/Functions/Math/Log2Function.cs diff --git a/NoStringEvaluating/Functions/Math/LogFunction.cs b/src/NoStringEvaluating/Functions/Math/LogFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/LogFunction.cs rename to src/NoStringEvaluating/Functions/Math/LogFunction.cs diff --git a/NoStringEvaluating/Functions/Math/MaxFunction.cs b/src/NoStringEvaluating/Functions/Math/MaxFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/MaxFunction.cs rename to src/NoStringEvaluating/Functions/Math/MaxFunction.cs diff --git a/NoStringEvaluating/Functions/Math/MeanFunction.cs b/src/NoStringEvaluating/Functions/Math/MeanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/MeanFunction.cs rename to src/NoStringEvaluating/Functions/Math/MeanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/MinFunction.cs b/src/NoStringEvaluating/Functions/Math/MinFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/MinFunction.cs rename to src/NoStringEvaluating/Functions/Math/MinFunction.cs diff --git a/NoStringEvaluating/Functions/Math/ModFunction.cs b/src/NoStringEvaluating/Functions/Math/ModFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/ModFunction.cs rename to src/NoStringEvaluating/Functions/Math/ModFunction.cs diff --git a/NoStringEvaluating/Functions/Math/MultiFunction.cs b/src/NoStringEvaluating/Functions/Math/MultiFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/MultiFunction.cs rename to src/NoStringEvaluating/Functions/Math/MultiFunction.cs diff --git a/NoStringEvaluating/Functions/Math/RoundFunction.cs b/src/NoStringEvaluating/Functions/Math/RoundFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/RoundFunction.cs rename to src/NoStringEvaluating/Functions/Math/RoundFunction.cs diff --git a/NoStringEvaluating/Functions/Math/SgnFunction.cs b/src/NoStringEvaluating/Functions/Math/SgnFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/SgnFunction.cs rename to src/NoStringEvaluating/Functions/Math/SgnFunction.cs diff --git a/NoStringEvaluating/Functions/Math/SignFunction.cs b/src/NoStringEvaluating/Functions/Math/SignFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/SignFunction.cs rename to src/NoStringEvaluating/Functions/Math/SignFunction.cs diff --git a/NoStringEvaluating/Functions/Math/SqrtFunction.cs b/src/NoStringEvaluating/Functions/Math/SqrtFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/SqrtFunction.cs rename to src/NoStringEvaluating/Functions/Math/SqrtFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcosFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcosFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcosFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcosFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcoshFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcoshFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcoshFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/AcoshFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccosFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccosFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccosFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccosFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccoshFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccoshFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccoshFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArccoshFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcosFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcosFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcosFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcosFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcoshFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcoshFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcoshFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/ArcoshFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CosFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CosFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/CosFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CosFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CoshFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CoshFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cos/CoshFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cos/CoshFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcosechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcosechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcosechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcosechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcschFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcschFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcschFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/AcschFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArccschFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArccschFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArccschFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArccschFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcosechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcosechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcosechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcosechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcschFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcschFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcschFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/ArcschFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosecFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosecFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosecFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosecFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CosechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CscFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CscFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CscFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CscFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CschFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CschFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CschFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cosec/CschFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcotFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcotFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcotFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcotFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcothFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcothFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcothFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/AcothFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ActghFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccotFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccotFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccotFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccotFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccothFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccothFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccothFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArccothFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/ArcctghFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CotFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CotFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CotFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CotFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CothFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CothFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CothFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CothFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Cotan/CtghFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/DegFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/DegFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/DegFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/DegFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/ExpFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/ExpFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/ExpFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/ExpFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/RadFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/RadFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/RadFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/RadFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsecFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsecFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsecFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsecFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArcsechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArsechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArsechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArsechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/ArsechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/AsechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/AsechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/AsechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/AsechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SecFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SecFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/SecFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SecFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SechFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SechFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sec/SechFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sec/SechFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArcsinhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/ArsinhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/AsinhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Sin/SinhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/ArctghFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/AtghFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanhFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanhFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanhFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TanhFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TgFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TgFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/TgFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TgFunction.cs diff --git a/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TghFunction.cs b/src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TghFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Math/Trigonometry/Tan/TghFunction.cs rename to src/NoStringEvaluating/Functions/Math/Trigonometry/Tan/TghFunction.cs diff --git a/NoStringEvaluating/Functions/Null/IfNullFunction.cs b/src/NoStringEvaluating/Functions/Null/IfNullFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Null/IfNullFunction.cs rename to src/NoStringEvaluating/Functions/Null/IfNullFunction.cs diff --git a/NoStringEvaluating/Functions/Null/IsNullFunction.cs b/src/NoStringEvaluating/Functions/Null/IsNullFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Null/IsNullFunction.cs rename to src/NoStringEvaluating/Functions/Null/IsNullFunction.cs diff --git a/NoStringEvaluating/Functions/Null/NullIfFunction.cs b/src/NoStringEvaluating/Functions/Null/NullIfFunction.cs similarity index 100% rename from NoStringEvaluating/Functions/Null/NullIfFunction.cs rename to src/NoStringEvaluating/Functions/Null/NullIfFunction.cs diff --git a/NoStringEvaluating/GlobalOptions.cs b/src/NoStringEvaluating/GlobalOptions.cs similarity index 96% rename from NoStringEvaluating/GlobalOptions.cs rename to src/NoStringEvaluating/GlobalOptions.cs index 26d029e..c8bb779 100644 --- a/NoStringEvaluating/GlobalOptions.cs +++ b/src/NoStringEvaluating/GlobalOptions.cs @@ -39,12 +39,12 @@ public static class GlobalOptions /// /// Assemblies with functions /// - public static HashSet FunctionsAssemblies { get; } = new(); + public static HashSet FunctionsAssemblies { get; } = []; /// /// Functions /// - public static HashSet Functions { get; } = new(); + public static HashSet Functions { get; } = []; /// /// Global options diff --git a/NoStringEvaluating/Models/Bracket.cs b/src/NoStringEvaluating/Models/Bracket.cs similarity index 100% rename from NoStringEvaluating/Models/Bracket.cs rename to src/NoStringEvaluating/Models/Bracket.cs diff --git a/NoStringEvaluating/Models/FloatingPointSymbol.cs b/src/NoStringEvaluating/Models/FloatingPointSymbol.cs similarity index 100% rename from NoStringEvaluating/Models/FloatingPointSymbol.cs rename to src/NoStringEvaluating/Models/FloatingPointSymbol.cs diff --git a/NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs b/src/NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs similarity index 61% rename from NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs rename to src/NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs index f988565..937fc88 100644 --- a/NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs +++ b/src/NoStringEvaluating/Models/FormulaChecker/CheckFormulaResult.cs @@ -3,28 +3,17 @@ /// /// Syntax checking result /// -public class CheckFormulaResult +public class CheckFormulaResult(List mistakes) { /// /// Mistakes /// - public List Mistakes { get; } + public List Mistakes { get; } = mistakes; /// /// Is checking OK /// - public bool Ok - { - get => Mistakes.Count is 0; - } - - /// - /// Syntax checking result - /// - public CheckFormulaResult(List mistakes) - { - Mistakes = mistakes; - } + public bool Ok => Mistakes.Count is 0; /// /// ToString diff --git a/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerMistakeType.cs b/src/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerMistakeType.cs similarity index 100% rename from NoStringEvaluating/Models/FormulaChecker/FormulaCheckerMistakeType.cs rename to src/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerMistakeType.cs diff --git a/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs b/src/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs similarity index 61% rename from NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs rename to src/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs index e629d06..97f16c6 100644 --- a/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs +++ b/src/NoStringEvaluating/Models/FormulaChecker/FormulaCheckerModel.cs @@ -3,38 +3,28 @@ /// /// Formula checker result item /// -public class FormulaCheckerModel +public class FormulaCheckerModel(FormulaCheckerMistakeType type, string message, string[] messageParts) { /// /// Mistake's type /// - public FormulaCheckerMistakeType MistakeType { get; } + public FormulaCheckerMistakeType MistakeType { get; } = type; /// /// Message /// - public string Message { get; } + public string Message { get; } = message; /// /// Important message parts /// - public string[] MessageParts { get; } - - /// - /// Formula checker result item - /// - public FormulaCheckerModel(FormulaCheckerMistakeType type, string message, string[] messageParts) - { - MistakeType = type; - Message = message; - MessageParts = messageParts; - } + public string[] MessageParts { get; } = messageParts; /// /// Formula checker result item /// public FormulaCheckerModel(FormulaCheckerMistakeType type, string message) - : this(type, message, Array.Empty()) + : this(type, message, []) { } diff --git a/NoStringEvaluating/Models/FunctionChar.cs b/src/NoStringEvaluating/Models/FunctionChar.cs similarity index 100% rename from NoStringEvaluating/Models/FunctionChar.cs rename to src/NoStringEvaluating/Models/FunctionChar.cs diff --git a/NoStringEvaluating/Models/Operator.cs b/src/NoStringEvaluating/Models/Operator.cs similarity index 100% rename from NoStringEvaluating/Models/Operator.cs rename to src/NoStringEvaluating/Models/Operator.cs diff --git a/NoStringEvaluating/Models/Values/EvaluatorValue.cs b/src/NoStringEvaluating/Models/Values/EvaluatorValue.cs similarity index 100% rename from NoStringEvaluating/Models/Values/EvaluatorValue.cs rename to src/NoStringEvaluating/Models/Values/EvaluatorValue.cs diff --git a/NoStringEvaluating/Models/Values/InternalEvaluatorValue.cs b/src/NoStringEvaluating/Models/Values/InternalEvaluatorValue.cs similarity index 100% rename from NoStringEvaluating/Models/Values/InternalEvaluatorValue.cs rename to src/NoStringEvaluating/Models/Values/InternalEvaluatorValue.cs diff --git a/NoStringEvaluating/Models/Values/ValueKeeper.cs b/src/NoStringEvaluating/Models/Values/ValueKeeper.cs similarity index 100% rename from NoStringEvaluating/Models/Values/ValueKeeper.cs rename to src/NoStringEvaluating/Models/Values/ValueKeeper.cs diff --git a/NoStringEvaluating/Models/Values/ValueKeeperContainer.cs b/src/NoStringEvaluating/Models/Values/ValueKeeperContainer.cs similarity index 95% rename from NoStringEvaluating/Models/Values/ValueKeeperContainer.cs rename to src/NoStringEvaluating/Models/Values/ValueKeeperContainer.cs index 1174989..6043e8e 100644 --- a/NoStringEvaluating/Models/Values/ValueKeeperContainer.cs +++ b/src/NoStringEvaluating/Models/Values/ValueKeeperContainer.cs @@ -7,7 +7,7 @@ namespace NoStringEvaluating.Models.Values; /// public sealed class ValueKeeperContainer : IDisposable { - private readonly List _valueKeeperList = new(); + private readonly List _valueKeeperList = []; private ObjectPool _pool; private int _index; diff --git a/NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs b/src/NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs similarity index 64% rename from NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs rename to src/NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs index 9297ed0..016ccb5 100644 --- a/NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs +++ b/src/NoStringEvaluating/Models/Values/ValueKeeperContainerReleaser.cs @@ -1,13 +1,8 @@ namespace NoStringEvaluating.Models.Values; -internal readonly struct ValueKeeperContainerReleaser : IDisposable +internal readonly struct ValueKeeperContainerReleaser(ValueKeeperContainer container) : IDisposable { - public ValueKeeperContainer Container { get; } - - public ValueKeeperContainerReleaser(ValueKeeperContainer container) - { - Container = container; - } + public ValueKeeperContainer Container { get; } = container; public void Dispose() { diff --git a/NoStringEvaluating/Models/Values/ValueTypeKey.cs b/src/NoStringEvaluating/Models/Values/ValueTypeKey.cs similarity index 100% rename from NoStringEvaluating/Models/Values/ValueTypeKey.cs rename to src/NoStringEvaluating/Models/Values/ValueTypeKey.cs diff --git a/NoStringEvaluating/NoStringEvaluating.csproj b/src/NoStringEvaluating/NoStringEvaluating.csproj similarity index 92% rename from NoStringEvaluating/NoStringEvaluating.csproj rename to src/NoStringEvaluating/NoStringEvaluating.csproj index 1404d41..2f04001 100644 --- a/NoStringEvaluating/NoStringEvaluating.csproj +++ b/src/NoStringEvaluating/NoStringEvaluating.csproj @@ -8,13 +8,12 @@ Fast low memory consuming mathematical evaluation without endless string parsing! Parses string formula once and uses its object sequence in each evaluation. MIT logo.png - 1) Add scientific notation -2) Add cases in formula checker + .NET 8 Math, Mathematics, Mathematical-Expression, Expressions, Parser, Formula, Evaluator, Calculator, Solve, Calculation, Logic, Condition, Custom, Function, Math-Parser, Expression-Evaluator, Formula-Parser, Object-Pooling, NoString, RPN https://github.com/KovtunV/NoStringEvaluating https://github.com/KovtunV/NoStringEvaluating git - 2.5.3 + 2.6.0 diff --git a/NoStringEvaluating/NoStringEvaluating.xml b/src/NoStringEvaluating/NoStringEvaluating.xml similarity index 99% rename from NoStringEvaluating/NoStringEvaluating.xml rename to src/NoStringEvaluating/NoStringEvaluating.xml index f2f6503..29b78cb 100644 --- a/NoStringEvaluating/NoStringEvaluating.xml +++ b/src/NoStringEvaluating/NoStringEvaluating.xml @@ -723,14 +723,14 @@ Raises when can't find a variable - + - VariableName + Raises when can't find a variable - + - Raises when can't find a variable + VariableName @@ -3613,6 +3613,11 @@ Syntax checking result + + + Syntax checking result + + Mistakes @@ -3623,11 +3628,6 @@ Is checking OK - - - Syntax checking result - - ToString @@ -3698,6 +3698,11 @@ Formula checker result item + + + Formula checker result item + + Mistake's type @@ -3713,11 +3718,6 @@ Important message parts - - - Formula checker result item - - Formula checker result item @@ -4293,14 +4293,14 @@ Formula node - + - Type key + Formula node - + - Formula node + Type key @@ -4373,14 +4373,14 @@ Formula node - Boolean - + - Boolean + Formula node - Boolean - + - Formula node - Boolean + Boolean @@ -4393,14 +4393,14 @@ Formula node - Bracket - + - Bracket + Formula node - Bracket - + - Formula node - bracket + Bracket @@ -4413,14 +4413,14 @@ Formula nodes - + - Nodes + Formula nodes - + - Formula nodes + Nodes @@ -4433,14 +4433,14 @@ Formula node - FunctionChar - + - FunctionChar + Formula node - FunctionChar - + - Formula node - FunctionChar + FunctionChar @@ -4453,6 +4453,11 @@ Formula node - Function + + + Formula node - Function + + Function @@ -4468,11 +4473,6 @@ Has negation in boolean - - - Formula node - Function - - ToString @@ -4483,6 +4483,11 @@ Formula node - Function wrapper + + + Formula node - Function wrapper + + Function node @@ -4493,11 +4498,6 @@ Function arguments - - - Formula node - Function wrapper - - ToString @@ -4523,14 +4523,14 @@ Formula node - NumberList - + - NumberList + Formula node - NumberList - + - Formula node - NumberList + NumberList @@ -4543,14 +4543,14 @@ Formula node - Number - + - Number + Formula node - Number - + - Formula node - Number + Number @@ -4588,6 +4588,11 @@ Formula node - Variable + + + Formula node - Variable + + Name @@ -4603,11 +4608,6 @@ Has negation in boolean - - - Formula node - Variable - - ToString @@ -4618,14 +4618,14 @@ Formula node - WordList - + - WordList + Formula node - WordList - + - Formula node - WordList + WordList @@ -4638,14 +4638,14 @@ Formula node - Word - + - Word + Formula node - Word - + - Formula node - Word + Word @@ -5441,14 +5441,14 @@ Border counter - + - Border count + Border counter - + - Border counter + Border count @@ -5541,6 +5541,11 @@ Name builder + + + Name builder + + Expected name @@ -5556,11 +5561,6 @@ Is finished - - - Name builder - - Try remembed char @@ -5576,14 +5576,14 @@ Parser from string to object sequence - + - Function reader + Parser from string to object sequence - + - Parser from string to object sequence + Function reader diff --git a/NoStringEvaluating/NoStringEvaluator.cs b/src/NoStringEvaluating/NoStringEvaluator.cs similarity index 97% rename from NoStringEvaluating/NoStringEvaluator.cs rename to src/NoStringEvaluating/NoStringEvaluator.cs index 3c06d6d..4237904 100644 --- a/NoStringEvaluating/NoStringEvaluator.cs +++ b/src/NoStringEvaluating/NoStringEvaluator.cs @@ -22,27 +22,16 @@ namespace NoStringEvaluating; /// /// Expression evaluator /// -public class NoStringEvaluator : INoStringEvaluator +public class NoStringEvaluator( + ObjectPool> stackPool, + ObjectPool> argsPool, + ObjectPool valueKeeperContainerPool, + IFormulaCache formulaCache) : INoStringEvaluator { - private readonly ObjectPool> _stackPool; - private readonly ObjectPool> _argsPool; - private readonly ObjectPool _valueKeeperContainerPool; - private readonly IFormulaCache _formulaCache; - - /// - /// Expression evaluator - /// - public NoStringEvaluator( - ObjectPool> stackPool, - ObjectPool> argsPool, - ObjectPool valueKeeperContainerPool, - IFormulaCache formulaCache) - { - _stackPool = stackPool; - _argsPool = argsPool; - _valueKeeperContainerPool = valueKeeperContainerPool; - _formulaCache = formulaCache; - } + private readonly ObjectPool> _stackPool = stackPool; + private readonly ObjectPool> _argsPool = argsPool; + private readonly ObjectPool _valueKeeperContainerPool = valueKeeperContainerPool; + private readonly IFormulaCache _formulaCache = formulaCache; #region Endpoints diff --git a/NoStringEvaluating/NoStringEvaluatorNullable.cs b/src/NoStringEvaluating/NoStringEvaluatorNullable.cs similarity index 94% rename from NoStringEvaluating/NoStringEvaluatorNullable.cs rename to src/NoStringEvaluating/NoStringEvaluatorNullable.cs index 18d35fb..6df80b1 100644 --- a/NoStringEvaluating/NoStringEvaluatorNullable.cs +++ b/src/NoStringEvaluating/NoStringEvaluatorNullable.cs @@ -15,17 +15,9 @@ namespace NoStringEvaluating; /// Expression evaluator with nullable result /// [ExcludeFromCodeCoverage] -public class NoStringEvaluatorNullable : INoStringEvaluatorNullable +public class NoStringEvaluatorNullable(INoStringEvaluator evaluator) : INoStringEvaluatorNullable { - private readonly INoStringEvaluator _evaluator; - - /// - /// Expression evaluator with nullable result - /// - public NoStringEvaluatorNullable(INoStringEvaluator evaluator) - { - _evaluator = evaluator; - } + private readonly INoStringEvaluator _evaluator = evaluator; #region NumberEndpoints @@ -505,44 +497,31 @@ public static Facade CreateFacade(Action options = nul /// /// Facade /// - public class Facade + public class Facade(NoStringEvaluator.Facade facade) { - /// - /// Facade - /// - public Facade(NoStringEvaluator.Facade facade) - { - Evaluator = new(facade.Evaluator); - - FunctionReader = facade.FunctionReader; - FormulaParser = facade.FormulaParser; - FormulaCache = facade.FormulaCache; - FormulaChecker = facade.FormulaChecker; - } - /// /// Evaluator /// - public NoStringEvaluatorNullable Evaluator { get; } + public NoStringEvaluatorNullable Evaluator { get; } = new(facade.Evaluator); /// /// FunctionReader /// - public FunctionReader FunctionReader { get; } + public FunctionReader FunctionReader { get; } = facade.FunctionReader; /// /// FormulaParser /// - public FormulaParser FormulaParser { get; } + public FormulaParser FormulaParser { get; } = facade.FormulaParser; /// /// FormulaCache /// - public FormulaCache FormulaCache { get; } + public FormulaCache FormulaCache { get; } = facade.FormulaCache; /// /// FormulaChecker /// - public FormulaChecker FormulaChecker { get; } + public FormulaChecker FormulaChecker { get; } = facade.FormulaChecker; } } diff --git a/NoStringEvaluating/NoStringEvaluatorOptions.cs b/src/NoStringEvaluating/NoStringEvaluatorOptions.cs similarity index 96% rename from NoStringEvaluating/NoStringEvaluatorOptions.cs rename to src/NoStringEvaluating/NoStringEvaluatorOptions.cs index a49c73e..f97d329 100644 --- a/NoStringEvaluating/NoStringEvaluatorOptions.cs +++ b/src/NoStringEvaluating/NoStringEvaluatorOptions.cs @@ -38,12 +38,12 @@ public class NoStringEvaluatorOptions /// /// Assemblies with functions /// - public HashSet FunctionsAssemblies { get; } = new(); + public HashSet FunctionsAssemblies { get; } = []; /// /// Functions /// - public HashSet Functions { get; } = new(); + public HashSet Functions { get; } = []; /// /// Options @@ -139,7 +139,7 @@ public NoStringEvaluatorOptions WithoutDefaultFunctions(bool withoutDefaultFunct /// public NoStringEvaluatorOptions WithFunctions(params IFunction[] functions) { - functions ??= Array.Empty(); + functions ??= []; functions.ForEach(x => Functions.Add(x)); return this; } diff --git a/src/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs b/src/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs new file mode 100644 index 0000000..da100e5 --- /dev/null +++ b/src/NoStringEvaluating/Nodes/Base/BaseFormulaNode.cs @@ -0,0 +1,12 @@ +namespace NoStringEvaluating.Nodes.Base; + +/// +/// Formula node +/// +public abstract class BaseFormulaNode(NodeTypeEnum typeKey) +{ + /// + /// Type key + /// + public NodeTypeEnum TypeKey { get; } = typeKey; +} diff --git a/NoStringEvaluating/Nodes/Base/NodeTypeEnum.cs b/src/NoStringEvaluating/Nodes/Base/NodeTypeEnum.cs similarity index 100% rename from NoStringEvaluating/Nodes/Base/NodeTypeEnum.cs rename to src/NoStringEvaluating/Nodes/Base/NodeTypeEnum.cs diff --git a/NoStringEvaluating/Nodes/BooleanNode.cs b/src/NoStringEvaluating/Nodes/BooleanNode.cs similarity index 60% rename from NoStringEvaluating/Nodes/BooleanNode.cs rename to src/NoStringEvaluating/Nodes/BooleanNode.cs index 31ad545..8f84708 100644 --- a/NoStringEvaluating/Nodes/BooleanNode.cs +++ b/src/NoStringEvaluating/Nodes/BooleanNode.cs @@ -6,21 +6,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Boolean /// -public class BooleanNode : BaseFormulaNode +public class BooleanNode(bool value) : BaseFormulaNode(NodeTypeEnum.Boolean) { /// /// Boolean /// - public bool Value { get; } - - /// - /// Formula node - Boolean - /// - public BooleanNode(bool value) - : base(NodeTypeEnum.Boolean) - { - Value = value; - } + public bool Value { get; } = value; /// /// ToString diff --git a/NoStringEvaluating/Nodes/BracketNode.cs b/src/NoStringEvaluating/Nodes/BracketNode.cs similarity index 70% rename from NoStringEvaluating/Nodes/BracketNode.cs rename to src/NoStringEvaluating/Nodes/BracketNode.cs index dffd2c8..02bf2b4 100644 --- a/NoStringEvaluating/Nodes/BracketNode.cs +++ b/src/NoStringEvaluating/Nodes/BracketNode.cs @@ -6,21 +6,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Bracket /// -public class BracketNode : BaseFormulaNode +public class BracketNode(Bracket bracket) : BaseFormulaNode(NodeTypeEnum.Bracket) { /// /// Bracket /// - public Bracket Bracket { get; } - - /// - /// Formula node - bracket - /// - public BracketNode(Bracket bracket) - : base(NodeTypeEnum.Bracket) - { - Bracket = bracket; - } + public Bracket Bracket { get; } = bracket; /// /// ToString diff --git a/src/NoStringEvaluating/Nodes/Common/FormulaNodes.cs b/src/NoStringEvaluating/Nodes/Common/FormulaNodes.cs new file mode 100644 index 0000000..8430cec --- /dev/null +++ b/src/NoStringEvaluating/Nodes/Common/FormulaNodes.cs @@ -0,0 +1,22 @@ +using NoStringEvaluating.Nodes.Base; + +namespace NoStringEvaluating.Nodes.Common; + +/// +/// Formula nodes +/// +public class FormulaNodes(List nodes) +{ + /// + /// Nodes + /// + public List Nodes { get; } = nodes; + + /// + /// ToString + /// + public override string ToString() + { + return string.Join(" ", Nodes); + } +} diff --git a/NoStringEvaluating/Nodes/FunctionCharNode.cs b/src/NoStringEvaluating/Nodes/FunctionCharNode.cs similarity index 68% rename from NoStringEvaluating/Nodes/FunctionCharNode.cs rename to src/NoStringEvaluating/Nodes/FunctionCharNode.cs index 809b685..6391836 100644 --- a/NoStringEvaluating/Nodes/FunctionCharNode.cs +++ b/src/NoStringEvaluating/Nodes/FunctionCharNode.cs @@ -6,21 +6,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - FunctionChar /// -public class FunctionCharNode : BaseFormulaNode +public class FunctionCharNode(FunctionChar functionChar) : BaseFormulaNode(NodeTypeEnum.FunctionChar) { /// /// FunctionChar /// - public FunctionChar FunctionChar { get; } - - /// - /// Formula node - FunctionChar - /// - public FunctionCharNode(FunctionChar functionChar) - : base(NodeTypeEnum.FunctionChar) - { - FunctionChar = functionChar; - } + public FunctionChar FunctionChar { get; } = functionChar; /// /// ToString diff --git a/NoStringEvaluating/Nodes/FunctionNode.cs b/src/NoStringEvaluating/Nodes/FunctionNode.cs similarity index 52% rename from NoStringEvaluating/Nodes/FunctionNode.cs rename to src/NoStringEvaluating/Nodes/FunctionNode.cs index cc97038..499dac1 100644 --- a/NoStringEvaluating/Nodes/FunctionNode.cs +++ b/src/NoStringEvaluating/Nodes/FunctionNode.cs @@ -6,33 +6,22 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Function /// -public class FunctionNode : BaseFormulaNode +public class FunctionNode(IFunction function, bool isNegative, bool isNegation) : BaseFormulaNode(NodeTypeEnum.Function) { /// /// Function /// - public IFunction Function { get; } + public IFunction Function { get; } = function; /// /// Has unary minus /// - public bool IsNegative { get; } + public bool IsNegative { get; } = isNegative; /// /// Has negation in boolean /// - public bool IsNegation { get; } - - /// - /// Formula node - Function - /// - public FunctionNode(IFunction function, bool isNegative, bool isNegation) - : base(NodeTypeEnum.Function) - { - Function = function; - IsNegative = isNegative; - IsNegation = isNegation; - } + public bool IsNegation { get; } = isNegation; /// /// ToString diff --git a/NoStringEvaluating/Nodes/FunctionWrapperNode.cs b/src/NoStringEvaluating/Nodes/FunctionWrapperNode.cs similarity index 60% rename from NoStringEvaluating/Nodes/FunctionWrapperNode.cs rename to src/NoStringEvaluating/Nodes/FunctionWrapperNode.cs index ad6d724..3a50143 100644 --- a/NoStringEvaluating/Nodes/FunctionWrapperNode.cs +++ b/src/NoStringEvaluating/Nodes/FunctionWrapperNode.cs @@ -5,27 +5,17 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Function wrapper /// -public class FunctionWrapperNode : BaseFormulaNode +public class FunctionWrapperNode(FunctionNode functionNode) : BaseFormulaNode(NodeTypeEnum.FunctionWrapper) { /// /// Function node /// - public FunctionNode FunctionNode { get; } + public FunctionNode FunctionNode { get; } = functionNode; /// /// Function arguments /// - public List> FunctionArgumentNodes { get; } - - /// - /// Formula node - Function wrapper - /// - public FunctionWrapperNode(FunctionNode functionNode) - : base(NodeTypeEnum.FunctionWrapper) - { - FunctionNode = functionNode; - FunctionArgumentNodes = new List>(); - } + public List> FunctionArgumentNodes { get; } = []; /// /// ToString diff --git a/NoStringEvaluating/Nodes/NullNode.cs b/src/NoStringEvaluating/Nodes/NullNode.cs similarity index 100% rename from NoStringEvaluating/Nodes/NullNode.cs rename to src/NoStringEvaluating/Nodes/NullNode.cs diff --git a/NoStringEvaluating/Nodes/NumberListNode.cs b/src/NoStringEvaluating/Nodes/NumberListNode.cs similarity index 53% rename from NoStringEvaluating/Nodes/NumberListNode.cs rename to src/NoStringEvaluating/Nodes/NumberListNode.cs index 098a022..dfdca31 100644 --- a/NoStringEvaluating/Nodes/NumberListNode.cs +++ b/src/NoStringEvaluating/Nodes/NumberListNode.cs @@ -5,21 +5,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - NumberList /// -public class NumberListNode : BaseFormulaNode +public class NumberListNode(List numberList) : BaseFormulaNode(NodeTypeEnum.NumberList) { /// /// NumberList /// - public List NumberList { get; } - - /// - /// Formula node - NumberList - /// - public NumberListNode(List numberList) - : base(NodeTypeEnum.NumberList) - { - NumberList = numberList; - } + public List NumberList { get; } = numberList; /// /// ToString diff --git a/NoStringEvaluating/Nodes/NumberNode.cs b/src/NoStringEvaluating/Nodes/NumberNode.cs similarity index 60% rename from NoStringEvaluating/Nodes/NumberNode.cs rename to src/NoStringEvaluating/Nodes/NumberNode.cs index 4a424d4..8e056a5 100644 --- a/NoStringEvaluating/Nodes/NumberNode.cs +++ b/src/NoStringEvaluating/Nodes/NumberNode.cs @@ -6,21 +6,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Number /// -public class NumberNode : BaseFormulaNode +public class NumberNode(double number) : BaseFormulaNode(NodeTypeEnum.Number) { /// /// Number /// - public double Number { get; } - - /// - /// Formula node - Number - /// - public NumberNode(double number) - : base(NodeTypeEnum.Number) - { - Number = number; - } + public double Number { get; } = number; /// /// ToString diff --git a/NoStringEvaluating/Nodes/OperatorNode.cs b/src/NoStringEvaluating/Nodes/OperatorNode.cs similarity index 100% rename from NoStringEvaluating/Nodes/OperatorNode.cs rename to src/NoStringEvaluating/Nodes/OperatorNode.cs diff --git a/NoStringEvaluating/Nodes/VariableNode.cs b/src/NoStringEvaluating/Nodes/VariableNode.cs similarity index 51% rename from NoStringEvaluating/Nodes/VariableNode.cs rename to src/NoStringEvaluating/Nodes/VariableNode.cs index 12fdad9..55247bc 100644 --- a/NoStringEvaluating/Nodes/VariableNode.cs +++ b/src/NoStringEvaluating/Nodes/VariableNode.cs @@ -5,33 +5,22 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Variable /// -public class VariableNode : BaseFormulaNode +public class VariableNode(string name, bool isNegative, bool isNegation) : BaseFormulaNode(NodeTypeEnum.Variable) { /// /// Name /// - public string Name { get; } + public string Name { get; } = name; /// /// Has unary minus /// - public bool IsNegative { get; } + public bool IsNegative { get; } = isNegative; /// /// Has negation in boolean /// - public bool IsNegation { get; } - - /// - /// Formula node - Variable - /// - public VariableNode(string name, bool isNegative, bool isNegation) - : base(NodeTypeEnum.Variable) - { - Name = name; - IsNegative = isNegative; - IsNegation = isNegation; - } + public bool IsNegation { get; } = isNegation; /// /// ToString diff --git a/NoStringEvaluating/Nodes/WordListNode.cs b/src/NoStringEvaluating/Nodes/WordListNode.cs similarity index 54% rename from NoStringEvaluating/Nodes/WordListNode.cs rename to src/NoStringEvaluating/Nodes/WordListNode.cs index 2abf2c6..9761b51 100644 --- a/NoStringEvaluating/Nodes/WordListNode.cs +++ b/src/NoStringEvaluating/Nodes/WordListNode.cs @@ -5,21 +5,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - WordList /// -public class WordListNode : BaseFormulaNode +public class WordListNode(List wordList) : BaseFormulaNode(NodeTypeEnum.WordList) { /// /// WordList /// - public List WordList { get; } - - /// - /// Formula node - WordList - /// - public WordListNode(List wordList) - : base(NodeTypeEnum.WordList) - { - WordList = wordList; - } + public List WordList { get; } = wordList; /// /// ToString diff --git a/NoStringEvaluating/Nodes/WordNode.cs b/src/NoStringEvaluating/Nodes/WordNode.cs similarity index 56% rename from NoStringEvaluating/Nodes/WordNode.cs rename to src/NoStringEvaluating/Nodes/WordNode.cs index 81f92bc..88c4c27 100644 --- a/NoStringEvaluating/Nodes/WordNode.cs +++ b/src/NoStringEvaluating/Nodes/WordNode.cs @@ -5,21 +5,12 @@ namespace NoStringEvaluating.Nodes; /// /// Formula node - Word /// -public class WordNode : BaseFormulaNode +public class WordNode(string word) : BaseFormulaNode(NodeTypeEnum.Word) { /// /// Word /// - public string Word { get; } - - /// - /// Formula node - Word - /// - public WordNode(string word) - : base(NodeTypeEnum.Word) - { - Word = word; - } + public string Word { get; } = word; /// /// ToString diff --git a/NoStringEvaluating/Properties/AssemblyInfo.cs b/src/NoStringEvaluating/Properties/AssemblyInfo.cs similarity index 100% rename from NoStringEvaluating/Properties/AssemblyInfo.cs rename to src/NoStringEvaluating/Properties/AssemblyInfo.cs diff --git a/NoStringEvaluating/Services/BorderCounter.cs b/src/NoStringEvaluating/Services/BorderCounter.cs similarity index 61% rename from NoStringEvaluating/Services/BorderCounter.cs rename to src/NoStringEvaluating/Services/BorderCounter.cs index ee9c0b3..8607640 100644 --- a/NoStringEvaluating/Services/BorderCounter.cs +++ b/src/NoStringEvaluating/Services/BorderCounter.cs @@ -5,24 +5,15 @@ namespace NoStringEvaluating.Services; /// /// Border counter /// -public class BorderCounter +public class BorderCounter(Func countFunc) where TNode : BaseFormulaNode { - private readonly Func _countFunc; + private readonly Func _countFunc = countFunc; /// /// Border count /// - public int Count { get; private set; } - - /// - /// Border counter - /// - public BorderCounter(Func countFunc) - { - _countFunc = countFunc; - Count = 1; - } + public int Count { get; private set; } = 1; /// /// Proceed border diff --git a/NoStringEvaluating/Services/BracketCounters.cs b/src/NoStringEvaluating/Services/BracketCounters.cs similarity index 93% rename from NoStringEvaluating/Services/BracketCounters.cs rename to src/NoStringEvaluating/Services/BracketCounters.cs index 2713a26..5f65eef 100644 --- a/NoStringEvaluating/Services/BracketCounters.cs +++ b/src/NoStringEvaluating/Services/BracketCounters.cs @@ -15,7 +15,7 @@ public class BracketCounters /// public BracketCounters() { - _borderCounters = new List>(); + _borderCounters = []; } /// diff --git a/NoStringEvaluating/Services/Cache/FormulaCache.cs b/src/NoStringEvaluating/Services/Cache/FormulaCache.cs similarity index 65% rename from NoStringEvaluating/Services/Cache/FormulaCache.cs rename to src/NoStringEvaluating/Services/Cache/FormulaCache.cs index 374d9a5..cfd387c 100644 --- a/NoStringEvaluating/Services/Cache/FormulaCache.cs +++ b/src/NoStringEvaluating/Services/Cache/FormulaCache.cs @@ -6,22 +6,11 @@ namespace NoStringEvaluating.Services.Cache; /// /// Parsed formula cache /// -public class FormulaCache : IFormulaCache +public class FormulaCache(IFormulaParser formulaParser) : IFormulaCache { - private readonly object _locker; - private readonly Dictionary _formulaNodes; - private readonly IFormulaParser _formulaParser; - - /// - /// Parsed formula cache - /// - public FormulaCache(IFormulaParser formulaParser) - { - _formulaNodes = new(); - _locker = new(); - - _formulaParser = formulaParser; - } + private readonly object _locker = new(); + private readonly Dictionary _formulaNodes = []; + private readonly IFormulaParser _formulaParser = formulaParser; /// /// Return cached formula nodes diff --git a/NoStringEvaluating/Services/Checking/FormulaChecker.cs b/src/NoStringEvaluating/Services/Checking/FormulaChecker.cs similarity index 97% rename from NoStringEvaluating/Services/Checking/FormulaChecker.cs rename to src/NoStringEvaluating/Services/Checking/FormulaChecker.cs index bffa5a5..380e1a0 100644 --- a/NoStringEvaluating/Services/Checking/FormulaChecker.cs +++ b/src/NoStringEvaluating/Services/Checking/FormulaChecker.cs @@ -9,17 +9,9 @@ namespace NoStringEvaluating.Services.Checking; /// /// Syntax checker /// -public class FormulaChecker : IFormulaChecker +public class FormulaChecker(IFormulaParser formulaParser) : IFormulaChecker { - private readonly IFormulaParser _formulaParser; - - /// - /// Syntax checker - /// - public FormulaChecker(IFormulaParser formulaParser) - { - _formulaParser = formulaParser; - } + private readonly IFormulaParser _formulaParser = formulaParser; /// /// Check syntax diff --git a/NoStringEvaluating/Services/IndexWatcher.cs b/src/NoStringEvaluating/Services/IndexWatcher.cs similarity index 100% rename from NoStringEvaluating/Services/IndexWatcher.cs rename to src/NoStringEvaluating/Services/IndexWatcher.cs diff --git a/NoStringEvaluating/Services/NameBuilder.cs b/src/NoStringEvaluating/Services/NameBuilder.cs similarity index 69% rename from NoStringEvaluating/Services/NameBuilder.cs rename to src/NoStringEvaluating/Services/NameBuilder.cs index 83b3cfa..73a0841 100644 --- a/NoStringEvaluating/Services/NameBuilder.cs +++ b/src/NoStringEvaluating/Services/NameBuilder.cs @@ -3,31 +3,22 @@ /// /// Name builder /// -public struct NameBuilder +public struct NameBuilder(string expectedName) { /// /// Expected name /// - public string ExpectedName { get; private set; } + public string ExpectedName { get; private set; } = expectedName; /// /// Length /// - public int Length { get; private set; } + public int Length { get; private set; } = 0; /// /// Is finished /// - public bool IsFinished => Length == ExpectedName.Length; - - /// - /// Name builder - /// - public NameBuilder(string expectedName) - { - ExpectedName = expectedName; - Length = 0; - } + public readonly bool IsFinished => Length == ExpectedName.Length; /// /// Try remembed char diff --git a/NoStringEvaluating/Services/OperationProcessor.cs b/src/NoStringEvaluating/Services/OperationProcessor.cs similarity index 100% rename from NoStringEvaluating/Services/OperationProcessor.cs rename to src/NoStringEvaluating/Services/OperationProcessor.cs diff --git a/NoStringEvaluating/Services/Parsing/FormulaParser.cs b/src/NoStringEvaluating/Services/Parsing/FormulaParser.cs similarity index 90% rename from NoStringEvaluating/Services/Parsing/FormulaParser.cs rename to src/NoStringEvaluating/Services/Parsing/FormulaParser.cs index 32d9664..b2d03f7 100644 --- a/NoStringEvaluating/Services/Parsing/FormulaParser.cs +++ b/src/NoStringEvaluating/Services/Parsing/FormulaParser.cs @@ -9,20 +9,12 @@ namespace NoStringEvaluating.Services.Parsing; /// /// Parser from string to object sequence /// -public class FormulaParser : IFormulaParser +public class FormulaParser(IFunctionReader functionReader) : IFormulaParser { /// /// Function reader /// - public IFunctionReader FunctionsReader { get; } - - /// - /// Parser from string to object sequence - /// - public FormulaParser(IFunctionReader functionReader) - { - FunctionsReader = functionReader; - } + public IFunctionReader FunctionsReader { get; } = functionReader; /// /// Return parsed formula nodes diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/BracketReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/BracketReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/BracketReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/BracketReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionCharReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionCharReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/FunctionCharReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionCharReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs similarity index 97% rename from NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs index 02be7ce..e74d411 100644 --- a/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs +++ b/src/NoStringEvaluating/Services/Parsing/NodeReaders/FunctionReader.cs @@ -12,15 +12,13 @@ namespace NoStringEvaluating.Services.Parsing.NodeReaders; /// public class FunctionReader : IFunctionReader { - private readonly List _functions; + private readonly List _functions = []; /// /// Function reader /// public FunctionReader() { - _functions = new List(); - GlobalOptions.FunctionsAssemblies .CreateInstances() .ForEach(x => AddFunction(x, replace: true)); diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/ListReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/ListReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/ListReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/ListReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/NegationReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/NegationReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/NegationReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/NegationReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/NumberReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/NumberReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/NumberReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/NumberReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs similarity index 95% rename from NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs index 84c4c0d..3b516cf 100644 --- a/NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs +++ b/src/NoStringEvaluating/Services/Parsing/NodeReaders/OperatorReader.cs @@ -14,7 +14,7 @@ public static class OperatorReader static OperatorReader() { // Pay attention and sort operators :) - _operators = new[] { "+", "-", "*", "/", "^", "<>", "<=", "<", ">=", ">", "==", "=", "!=", "&&", "||" }; + _operators = ["+", "-", "*", "/", "^", "<>", "<=", "<", ">=", ">", "==", "=", "!=", "&&", "||"]; } /// diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/UnaryMinusReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/UnaryMinusReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/UnaryMinusReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/UnaryMinusReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/VariableReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/VariableReader.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/NodeReaders/VariableReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/VariableReader.cs diff --git a/NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs b/src/NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs similarity index 96% rename from NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs rename to src/NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs index a38054c..43543a8 100644 --- a/NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs +++ b/src/NoStringEvaluating/Services/Parsing/NodeReaders/WordReader.cs @@ -12,7 +12,7 @@ public static class WordReader static WordReader() { - Quotes = new[] { '\'', '"' }.ToHashSet(); + Quotes = ['\'', '"']; } /// diff --git a/NoStringEvaluating/Services/Parsing/PolishNotationService.cs b/src/NoStringEvaluating/Services/Parsing/PolishNotationService.cs similarity index 100% rename from NoStringEvaluating/Services/Parsing/PolishNotationService.cs rename to src/NoStringEvaluating/Services/Parsing/PolishNotationService.cs diff --git a/NoStringEvaluating/Services/Value/WordFormatter.cs b/src/NoStringEvaluating/Services/Value/WordFormatter.cs similarity index 100% rename from NoStringEvaluating/Services/Value/WordFormatter.cs rename to src/NoStringEvaluating/Services/Value/WordFormatter.cs diff --git a/NoStringEvaluating/Services/Variables/KnownVariables.cs b/src/NoStringEvaluating/Services/Variables/KnownVariables.cs similarity index 100% rename from NoStringEvaluating/Services/Variables/KnownVariables.cs rename to src/NoStringEvaluating/Services/Variables/KnownVariables.cs diff --git a/NoStringEvaluating/Services/Variables/VariablesSource.cs b/src/NoStringEvaluating/Services/Variables/VariablesSource.cs similarity index 100% rename from NoStringEvaluating/Services/Variables/VariablesSource.cs rename to src/NoStringEvaluating/Services/Variables/VariablesSource.cs diff --git a/NoStringEvaluating/logo.png b/src/NoStringEvaluating/logo.png similarity index 100% rename from NoStringEvaluating/logo.png rename to src/NoStringEvaluating/logo.png