C++ version

.clang-format

@@ -0,0 +1,26 @@
+---
+BasedOnStyle: Microsoft
+AccessModifierOffset : -4
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: true
+#AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: InlineOnly
+AlwaysBreakTemplateDeclarations  : true
+BreakBeforeBraces: Custom
+BraceWrapping : 
+ AfterEnum : true
+ AfterCaseLabel : true
+BreakConstructorInitializers: BeforeComma
+ColumnLimit: 132
+#IndentCaseBlocks: 'true'
+IndentCaseLabels: 'true'
+PointerAlignment: Left
+UseTab : 'Never'
+
+SortIncludes : false
+
+AlignAfterOpenBracket: Align
+AllowAllArgumentsOnNextLine: false
+BinPackParameters : false
+BinPackArguments : false
+...

.gitignore

@@ -13,3 +13,4 @@
 
 # NuGet packages
 /packages/
+Debug/

Fluid-HTN.UnitTests/Fluid-HTN.UnitTests.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -41,10 +41,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
+      <HintPath>..\packages\MSTest.TestFramework.2.1.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -63,23 +63,23 @@
     <Compile Include="DomainTests.cs" />
     <Compile Include="PlannerTests.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fluid-HTN\Fluid-HTN.csproj">
       <Project>{B6908CED-5C0B-415C-9564-85F66A8B5025}</Project>
       <Name>Fluid-HTN</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
-    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
   </Target>
-  <Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
 </Project>

Fluid-HTN.UnitTests/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net472" />
-  <package id="MSTest.TestFramework" version="1.3.2" targetFramework="net472" />
+  <package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net472" />
+  <package id="MSTest.TestFramework" version="2.1.2" targetFramework="net472" />
 </packages>

Fluid-HTN.sln

@@ -7,20 +7,68 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluid-HTN", "Fluid-HTN\Flui
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fluid-HTN.UnitTests", "Fluid-HTN.UnitTests\Fluid-HTN.UnitTests.csproj", "{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fluid-HTNCPP", "Fluid-HTNCPP\Fluid-HTNCPP.vcxproj", "{0C469B65-6D39-4667-8D00-9EC963C518E3}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Fluid-HTNCPP.UnitTests", "Fluid-HTNCPP.UnitTests\Fluid-HTNCPP.UnitTests.vcxproj", "{402394C5-2D69-49F0-B2E2-239FAB4CC252}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Debug|x86.Build.0 = Debug|Any CPU
 		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|x64.Build.0 = Release|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6908CED-5C0B-415C-9564-85F66A8B5025}.Release|x86.Build.0 = Release|Any CPU
 		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|x64.Build.0 = Debug|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Debug|x86.Build.0 = Debug|Any CPU
 		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|x64.ActiveCfg = Release|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|x64.Build.0 = Release|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|x86.ActiveCfg = Release|Any CPU
+		{A6DAA5DB-FC2B-4D08-87A1-0E667A39CF21}.Release|x86.Build.0 = Release|Any CPU
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|Any CPU.Build.0 = Debug|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|x64.ActiveCfg = Debug|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|x64.Build.0 = Debug|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|x86.ActiveCfg = Debug|Win32
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Debug|x86.Build.0 = Debug|Win32
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|Any CPU.ActiveCfg = Release|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|Any CPU.Build.0 = Release|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|x64.ActiveCfg = Release|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|x64.Build.0 = Release|x64
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|x86.ActiveCfg = Release|Win32
+		{0C469B65-6D39-4667-8D00-9EC963C518E3}.Release|x86.Build.0 = Release|Win32
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|Any CPU.Build.0 = Debug|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|x64.ActiveCfg = Debug|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|x64.Build.0 = Debug|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|x86.ActiveCfg = Debug|Win32
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Debug|x86.Build.0 = Debug|Win32
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|Any CPU.ActiveCfg = Release|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|Any CPU.Build.0 = Release|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|x64.ActiveCfg = Release|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|x64.Build.0 = Release|x64
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|x86.ActiveCfg = Release|Win32
+		{402394C5-2D69-49F0-B2E2-239FAB4CC252}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Fluid-HTN/Fluid-HTN.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -13,6 +14,8 @@
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -75,6 +78,16 @@
     <Compile Include="Tasks\CompoundTasks\TaskRoot.cs" />
     <Compile Include="Tasks\TaskStatus.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.props'))" />
+    <Error Condition="!Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets'))" />
+  </Target>
+  <Import Project="..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.2.1.2\build\net45\MSTest.TestAdapter.targets')" />
 </Project>

Fluid-HTN/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="MSTest.TestAdapter" version="2.1.2" targetFramework="net472" />
+</packages>

Fluid-HTNCPP.UnitTests/ActionEffectsTest.cpp

@@ -0,0 +1,72 @@
+#include "pch.h"
+#include "CppUnitTest.h"
+#include "Contexts/BaseContext.h"
+#include "Effects/Effect.h"
+#include "DomainTestContext.h"
+
+using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+
+using namespace FluidHTN;
+
+class TestContext : public BaseContext<DomainTestState, uint8_t,DomainTestWorldState>
+{
+	bool _Done = false;
+public:
+	bool& Done() { return _Done; }
+};
+
+namespace Microsoft::VisualStudio::CppUnitTestFramework
+{
+	template<>
+	std::wstring ToString<EffectType>(const EffectType& eff)
+	{
+		switch(eff)
+		{
+		case EffectType::Permanent:
+			return L"EffectType::Permanent";
+		case EffectType::PlanOnly:
+			return L"EffectType::PlanOnly";
+		case EffectType::PlanAndExecute:
+			return L"EffectType::PlanAndExecute";
+		}
+		return L"Unknown value";
+	}
+}
+namespace FluidHTNCPPUnitTests
+{
+	TEST_CLASS(ActionEffectTests)
+	{
+	public:
+
+		TEST_METHOD(SetsName_ExpectedBehavior)
+		{
+			ActionEffect a("Name", EffectType::PlanOnly, nullptr);
+
+			Assert::AreEqual("Name"s, a.Name());
+		}
+		TEST_METHOD(SetsType_ExpectedBehavior)
+		{
+			 ActionEffect e("Name", EffectType::PlanOnly, nullptr);
+
+			Assert::AreEqual(EffectType::PlanOnly, e.Type());
+		}
+
+		TEST_METHOD(ApplyDoesNothingWithoutFunctionPtr_ExpectedBehavior)
+		{
+			TestContext ctx;
+			ActionEffect e("Name", EffectType::PlanOnly, nullptr);
+
+			e.Apply(ctx);
+		}
+
+		TEST_METHOD(ApplyCallsInternalFunctionPtr_ExpectedBehavior)
+		{
+			TestContext ctx;
+			ActionEffect e("Name", EffectType::PlanOnly, [=](IContext& c, EffectType ) {static_cast<TestContext&>(c).Done() = true; });
+
+			e.Apply(ctx);
+
+			Assert::AreEqual(true, ctx.Done());
+		}
+	};
+}