fix wrong path

hypar-io · Jan 4, 2024 · 0606b02 · 0606b02
1 parent 66682bd
commit 0606b02
Show file tree

Hide file tree

Showing 11 changed files with 186 additions and 4,979 deletions.
diff --git a/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs b/LayoutFunctions/LayoutFunctionCommon/LayoutGeneration.cs
@@ -41,7 +41,7 @@ public class LayoutGeneration<TLevelElements, TLevelVolume, TSpaceBoundary, TCir
             // var configJson = configurationsPath != null ? File.ReadAllText(configurationsPath) : "{}";
             // var configs = DeserializeConfigJson(configJson);
 
-            string configJsonPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), catalogPath);
+            string configJsonPath = Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), configurationsPath);
             SpaceConfiguration configs = ContentManagement.GetSpaceConfiguration(inputModels, configJsonPath, programTypeName);
 
             var spacePlanningZones = inputModels["Space Planning Zones"];

diff --git a/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest.cs b/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest.cs
@@ -20,11 +20,9 @@ public void TestExecute()
             var input = GetInput();
 
             var modelDependencies = new Dictionary<string, Model> { 
-                {"Space Planning Zones", Model.FromJson(File.ReadAllText(@"/Users/andrewheumann/Dev/HyparSpace/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest/model_dependencies/Space Planning Zones/3766843c-d3e1-4d8b-a9dc-1346129dce0d.json")) }, 
-                {"Circulation", Model.FromJson(File.ReadAllText(@"/Users/andrewheumann/Dev/HyparSpace/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest/model_dependencies/Circulation/ffbac511-d7b0-4d42-9d1a-5b0cb04efdd5.json")) }, 
-                {"Levels", Model.FromJson(File.ReadAllText(@"/Users/andrewheumann/Dev/HyparSpace/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest/model_dependencies/Levels/e15481c1-7a2b-4e9f-970f-e2eb59832484.json")) }, 
-                {"Conceptual Mass", Model.FromJson(File.ReadAllText(@"/Users/andrewheumann/Dev/HyparSpace/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest/model_dependencies/Conceptual Mass/340e8f7e-9f14-4022-b45d-7197b2d99b1f.json")) }, 
-                {"Open Office Layout", Model.FromJson(File.ReadAllText(@"/Users/andrewheumann/Dev/HyparSpace/LayoutFunctions/OpenCollabLayout/test/Generated/OpenCollaborationLayoutTest/model_dependencies/Open Office Layout/3c8b071f-64dd-48df-8730-12b3caf26887.json")) }, 
+                {"Open Office Layout", Model.FromJson(File.ReadAllText(@"C:\dev\Hypar\HyparSpace\LayoutFunctions\OpenCollabLayout\test\Generated\OpenCollaborationLayoutTest\model_dependencies\Open Office Layout\ade78e70-90b1-4e64-b725-8cc39ba9ce09.json")) }, 
+                {"Program Requirements", Model.FromJson(File.ReadAllText(@"C:\dev\Hypar\HyparSpace\LayoutFunctions\OpenCollabLayout\test\Generated\OpenCollaborationLayoutTest\model_dependencies\Program Requirements\99b290a0-e736-416a-8f5c-30dad94fe6f9.json")) }, 
+                {"Space Planning Zones", Model.FromJson(File.ReadAllText(@"C:\dev\Hypar\HyparSpace\LayoutFunctions\OpenCollabLayout\test\Generated\OpenCollaborationLayoutTest\model_dependencies\Space Planning Zones\d7e28a33-5b24-49c6-b188-8af92d682546.json")) }, 
             };
 
             var result = OpenCollaborationLayout.Execute(modelDependencies, input);

diff --git a/...ayoutTest/model_dependencies/Open Office Layout/ade78e70-90b1-4e64-b725-8cc39ba9ce09.json b/...ayoutTest/model_dependencies/Open Office Layout/ade78e70-90b1-4e64-b725-8cc39ba9ce09.json
diff --git a/...outTest/model_dependencies/Program Requirements/99b290a0-e736-416a-8f5c-30dad94fe6f9.json b/...outTest/model_dependencies/Program Requirements/99b290a0-e736-416a-8f5c-30dad94fe6f9.json
diff --git a/...outTest/model_dependencies/Space Planning Zones/d7e28a33-5b24-49c6-b188-8af92d682546.json b/...outTest/model_dependencies/Space Planning Zones/d7e28a33-5b24-49c6-b188-8af92d682546.json
@@ -0,0 +1 @@
+{"Transform":{"Matrix":{"Components":[1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0]}},"Elements":{"9babb829-9b96-4e73-97f4-9658d4d6c31c":{"discriminator":"Elements.Material","Color":{"Red":1.0,"Green":1.0,"Blue":1.0,"Alpha":1.0},"SpecularFactor":0.0,"GlossinessFactor":0.0,"Unlit":false,"DoubleSided":false,"RepeatTexture":true,"InterpolateTexture":true,"EmissiveFactor":0.0,"Draw In Front":false,"EdgeDisplaySettings":null,"Id":"9babb829-9b96-4e73-97f4-9658d4d6c31c","Name":"default"},"86f64b5f-a73a-48aa-a9fb-d94ec85b1ab5":{"Transform":{"Matrix":{"Components":[1.0,0.0,0.0,0.0,0.0,1.0,0.0,0.0,0.0,0.0,1.0,0.0]}},"Material":"9babb829-9b96-4e73-97f4-9658d4d6c31c","Representation":null,"IsElementDefinition":false,"Id":"86f64b5f-a73a-48aa-a9fb-d94ec85b1ab5","Name":"Open Office","CollectedSpaces":[],"AlignmentEdge":null,"ParentCentroid":null,"AutoPlaced":false,"FromAlignmentEdge":null,"Boundary":{"Voids":[],"Perimeter":{"discriminator":"Elements.Geometry.Polygon","Vertices":[{"X":-2.6889015434925447,"Y":-13.426534623918503,"Z":0},{"X":12.615241130434107,"Y":-13.426534623918503,"Z":0},{"X":12.615241130434107,"Y":0.9719941316498129,"Z":0},{"X":-2.6889015434925447,"Y":0.9719941316498129,"Z":0}]},"Id":"a6b7b0d4-9846-424b-bf76-2fce335ec1cd","discriminator":"Elements.Geometry.Profile"},"SpaceCount":1,"AvailableLength":0,"Height":3,"Hypar Space Type":"Open Office","ToAlignmentEdge":null,"AdjacentCorridorEdges":null,"ProgramName":"Open Office","IndividualCentroid":null,"discriminator":"Elements.SpaceBoundary","Area":16.000000000000004,"Level":"c1379716-2d1c-4269-969a-55ce80081d72","CountPlaced":0,"Program Type":"Open Office"},"5a09089e-328c-44fe-923b-4e90c3597759":{"discriminator":"Elements.LevelElements","Elements":["86f64b5f-a73a-48aa-a9fb-d94ec85b1ab5"],"Level":"b6e2ce12-3978-42d6-a0f4-5d2be76f01fd","Id":"5a09089e-328c-44fe-923b-4e90c3597759","Name":null}}}