From db106eef498e2a4cf37d505d983da8a46c776af7 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 10:56:43 -0400 Subject: [PATCH 01/12] Organize TMG-Framework to use XTMF2-Dev directory This also removes the usage of the XTMF2 submodule, and reorganizes the repository into the standard src and test folders. --- .../TMG-Framework.sln => TMG-Framework.sln | 0 .../Loading/LoadCategoriesFromCSV.cs | 58 ------------- UpdateReferences.bat | 5 -- XTMF2 | 1 - .../Construct/ConstructTimePeriodFromTimes.cs | 0 .../Convert/ConvertTimesToTimePeriod.cs | 0 .../TMG-Framework/Data/Categories.cs | 0 .../TMG-Framework/Data/CategoryIndex.cs | 0 .../TMG-Framework/Data/CategoryMap.cs | 0 .../src => src}/TMG-Framework/Data/Matrix.cs | 0 .../src => src}/TMG-Framework/Data/Range.cs | 0 .../TMG-Framework/Data/RangeSet.cs | 0 .../TMG-Framework/Data/RangeSetSet.cs | 0 .../src => src}/TMG-Framework/Data/Time.cs | 0 .../TMG-Framework/Data/TimePeriod.cs | 0 .../src => src}/TMG-Framework/Data/Vector.cs | 0 .../TMG-Framework/FileOperations/CopyFile.cs | 0 .../FileOperations/DeleteFile.cs | 0 .../Loading/LoadCategoriesFromCSV.cs | 87 +++++++++++++++++++ .../LoadCategoryMapFromThirdNormalizedCSV.cs | 0 .../Loading/LoadMatrixFromCSVMatrix.cs | 0 .../LoadMatrixFromCSVThirdNormalized.cs | 0 .../Loading/LoadMatrixFromMTX.cs | 0 .../Loading/LoadVectorFromCSV.cs | 0 .../TMG-Framework/Processing/AST/ASTNode.cs | 0 .../TMG-Framework/Processing/AST/Add.cs | 0 .../Processing/AST/CompareAnd.cs | 0 .../Processing/AST/CompareEqual.cs | 0 .../Processing/AST/CompareGreaterThan.cs | 0 .../AST/CompareGreaterThanOrEqual.cs | 0 .../Processing/AST/CompareNotEquals.cs | 0 .../TMG-Framework/Processing/AST/CompareOr.cs | 0 .../TMG-Framework/Processing/AST/Compiler.cs | 0 .../TMG-Framework/Processing/AST/Divide.cs | 0 .../TMG-Framework/Processing/AST/Exponent.cs | 0 .../Processing/AST/Expression.cs | 0 .../Processing/AST/FunctionCall.cs | 0 .../Processing/AST/FusedMultiplyAdd.cs | 0 .../TMG-Framework/Processing/AST/Multiply.cs | 0 .../TMG-Framework/Processing/AST/Negate.cs | 0 .../TMG-Framework/Processing/AST/Subtract.cs | 0 .../TMG-Framework/Processing/AST/Variable.cs | 0 .../Processing/AppendMatrixValueToCSV.cs | 0 .../Processing/Evaluate2DGravityModel.cs | 0 .../Processing/EvaluateMatrix.cs | 0 .../Processing/EvaluateScalar.cs | 0 .../Processing/EvaluateVector.cs | 0 .../ExecutePipelineInOrderParallel.cs | 0 .../Processing/IntegerizeMatrix.cs | 0 .../TMG-Framework/Saving/SaveMatrixAsCSV.cs | 0 .../TMG-Framework/Saving/SaveMatrixAsMTX.cs | 0 .../TMG-Framework/Saving/SaveVectorAsCSV.cs | 0 .../TMG-Framework/Select/SelectGivenTime.cs | 0 .../TMG-Framework/TMG-Framework.csproj | 14 +-- .../TMG-Framework/Utilities/CSVReader.cs | 0 .../Utilities/ExceptionHelper.cs | 0 .../TMG-Framework/Utilities/ObjectStream.cs | 0 .../TMG-Framework/Utilities/SpanHelper.cs | 0 .../Utilities/VectorHelper/Add.cs | 0 .../VectorHelper/Conditions/FlagAnd.cs | 0 .../VectorHelper/Conditions/FlagIfEquals.cs | 0 .../Conditions/FlagIfGreaterThan.cs | 0 .../Conditions/FlagIfGreaterThanOrEqual.cs | 0 .../VectorHelper/Conditions/FlagIfLessThan.cs | 0 .../Conditions/FlagIfLessThanOrEqual.cs | 0 .../Conditions/FlagIfNotEquals.cs | 0 .../VectorHelper/Conditions/FlagOr.cs | 0 .../Utilities/VectorHelper/Divide.cs | 0 .../Utilities/VectorHelper/Exp.cs | 0 .../VectorHelper/FusedMultiplyAdd.cs | 0 .../Utilities/VectorHelper/If.cs | 0 .../Utilities/VectorHelper/Log.cs | 0 .../Utilities/VectorHelper/Multiply.cs | 0 .../Utilities/VectorHelper/Pow.cs | 0 .../Utilities/VectorHelper/Subtract.cs | 0 .../Utilities/VectorHelper/VectorHelper.cs | 0 .../tests => tests}/PerformanceTest/Helper.cs | 0 .../PerformanceTest/MapHelper.cs | 0 .../PerformanceTest/PerformanceTest.csproj | 0 .../PerformanceTest/Program.cs | 0 .../ArbitaryParameterParser.cs | 0 .../TestConstructTimePeriodFromTimes.cs | 0 .../Convert/TestConvertTimesToTimePeriod.cs | 0 .../TMG-Framework.Test/Data/CategoriesTest.cs | 0 .../Data/CategoryMapTest.cs | 0 .../TMG-Framework.Test/Data/MatrixTest.cs | 0 .../TMG-Framework.Test/Data/RangeSetTest.cs | 0 .../TMG-Framework.Test/Data/RangeTest.cs | 0 .../TMG-Framework.Test/Data/VectorTest.cs | 0 .../TMG-Framework.Test/EnsureRuntimeLaunch.cs | 0 ...stLoadCategoryMapFromThirdNormalizedCSV.cs | 0 .../Loading/TestLoadMapFromCSV.cs | 0 .../Loading/TestLoadMatrix.cs | 0 .../Loading/TestLoadVector.cs | 0 .../Processing/TestAppendMatrixValueToCSV.cs | 0 .../Processing/TestEvaluateMatrix.cs | 0 .../Processing/TestEvaluateScalar.cs | 0 .../Processing/TestEvaluateVector.cs | 0 .../TestExecutePipelineInOrderParallel.cs | 0 .../Processing/TestGravityModel.cs | 0 .../Processing/TestIntegerizeMatrix.cs | 0 .../Saving/TestSaveMatrixAsCSV.cs | 0 .../Saving/TestSaveMatrixAsMTX.cs | 0 .../Saving/TestSaveVectorAsCSV.cs | 0 .../Select/TestSelectGivenTime.cs | 0 .../TMG-Framework.Test.csproj | 0 .../TMG-Framework.Test/Utilities/Helper.cs | 0 .../TMG-Framework.Test/Utilities/MapHelper.cs | 0 .../Utilities/MatrixHelper.cs | 0 .../Utilities/TestCSVReader.cs | 0 .../Utilities/TestCompiler.cs | 0 .../VectorHelper/Conditions/TestFlagAnd.cs | 0 .../Conditions/TestFlagIfEquals.cs | 0 .../Conditions/TestFlagIfGreaterThan.cs | 0 .../TestFlagIfGreaterThanOrEqual.cs | 0 .../Conditions/TestFlagIfLessThan.cs | 0 .../Conditions/TestFlagIfLessThanOrEqual.cs | 0 .../Conditions/TestFlagIfNotEquals.cs | 0 .../VectorHelper/Conditions/TestFlagOr.cs | 0 .../Utilities/VectorHelper/TestAdd.cs | 0 .../Utilities/VectorHelper/TestDivide.cs | 0 .../Utilities/VectorHelper/TestExp.cs | 0 .../VectorHelper/TestFusedMultiplyAdd.cs | 0 .../Utilities/VectorHelper/TestIf.cs | 0 .../Utilities/VectorHelper/TestLog.cs | 0 .../Utilities/VectorHelper/TestMultiply.cs | 0 .../Utilities/VectorHelper/TestPow.cs | 0 .../Utilities/VectorHelper/TestSubtract.cs | 0 .../Utilities/VectorHelper/VectorHelper.cs | 0 129 files changed, 96 insertions(+), 69 deletions(-) rename TMG-Framework/TMG-Framework.sln => TMG-Framework.sln (100%) delete mode 100644 TMG-Framework/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs delete mode 100755 UpdateReferences.bat delete mode 160000 XTMF2 rename {TMG-Framework/src => src}/TMG-Framework/Construct/ConstructTimePeriodFromTimes.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Convert/ConvertTimesToTimePeriod.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/Categories.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/CategoryIndex.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/CategoryMap.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/Matrix.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/Range.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/RangeSet.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/RangeSetSet.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/Time.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/TimePeriod.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Data/Vector.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/FileOperations/CopyFile.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/FileOperations/DeleteFile.cs (100%) create mode 100644 src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs rename {TMG-Framework/src => src}/TMG-Framework/Loading/LoadCategoryMapFromThirdNormalizedCSV.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Loading/LoadMatrixFromCSVMatrix.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Loading/LoadMatrixFromCSVThirdNormalized.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Loading/LoadMatrixFromMTX.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Loading/LoadVectorFromCSV.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/ASTNode.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Add.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareAnd.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareEqual.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareGreaterThan.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareGreaterThanOrEqual.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareNotEquals.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/CompareOr.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Compiler.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Divide.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Exponent.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Expression.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/FunctionCall.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/FusedMultiplyAdd.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Multiply.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Negate.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Subtract.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AST/Variable.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/AppendMatrixValueToCSV.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/Evaluate2DGravityModel.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/EvaluateMatrix.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/EvaluateScalar.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/EvaluateVector.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/ExecutePipelineInOrderParallel.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Processing/IntegerizeMatrix.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Saving/SaveMatrixAsCSV.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Saving/SaveMatrixAsMTX.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Saving/SaveVectorAsCSV.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Select/SelectGivenTime.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/TMG-Framework.csproj (64%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/CSVReader.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/ExceptionHelper.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/ObjectStream.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/SpanHelper.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Add.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagAnd.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfEquals.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThan.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThanOrEqual.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThan.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThanOrEqual.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfNotEquals.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Conditions/FlagOr.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Divide.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Exp.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/FusedMultiplyAdd.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/If.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Log.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Multiply.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Pow.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/Subtract.cs (100%) rename {TMG-Framework/src => src}/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs (100%) rename {TMG-Framework/tests => tests}/PerformanceTest/Helper.cs (100%) rename {TMG-Framework/tests => tests}/PerformanceTest/MapHelper.cs (100%) rename {TMG-Framework/tests => tests}/PerformanceTest/PerformanceTest.csproj (100%) rename {TMG-Framework/tests => tests}/PerformanceTest/Program.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/ArbitaryParameterParser.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Construct/TestConstructTimePeriodFromTimes.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Convert/TestConvertTimesToTimePeriod.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/CategoriesTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/CategoryMapTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/MatrixTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/RangeSetTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/RangeTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Data/VectorTest.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/EnsureRuntimeLaunch.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Loading/TestLoadMapFromCSV.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Loading/TestLoadMatrix.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Loading/TestLoadVector.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestAppendMatrixValueToCSV.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestEvaluateMatrix.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestEvaluateScalar.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestEvaluateVector.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestExecutePipelineInOrderParallel.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestGravityModel.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Processing/TestIntegerizeMatrix.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Saving/TestSaveMatrixAsCSV.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Saving/TestSaveMatrixAsMTX.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Saving/TestSaveVectorAsCSV.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Select/TestSelectGivenTime.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/TMG-Framework.Test.csproj (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/Helper.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/MapHelper.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/MatrixHelper.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/TestCSVReader.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/TestCompiler.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagAnd.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfEquals.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThan.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThanOrEqual.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThan.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThanOrEqual.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfNotEquals.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagOr.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestAdd.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestDivide.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestExp.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestFusedMultiplyAdd.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestIf.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestLog.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestMultiply.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestPow.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/TestSubtract.cs (100%) rename {TMG-Framework/tests => tests}/TMG-Framework.Test/Utilities/VectorHelper/VectorHelper.cs (100%) diff --git a/TMG-Framework/TMG-Framework.sln b/TMG-Framework.sln similarity index 100% rename from TMG-Framework/TMG-Framework.sln rename to TMG-Framework.sln diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs b/TMG-Framework/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs deleted file mode 100644 index 8dd728b..0000000 --- a/TMG-Framework/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs +++ /dev/null @@ -1,58 +0,0 @@ -/* - Copyright 2017-2018 University of Toronto - - This file is part of TMG-Framework for XTMF2. - - TMG-Framework for XTMF2 is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - TMG-Framework for XTMF2 is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with TMG-Framework for XTMF2. If not, see . -*/ -using System; -using System.Collections.Generic; -using System.Text; -using TMG.Utilities; -using XTMF2; - -namespace TMG.Loading -{ - [Module(Name = "Load Categories From CSV", Description = "Loads categories where each row has a different sparse index.", - DocumentationLink = "http://tmg.utoronto.ca/doc/2.0")] - public sealed class LoadCategoriesFromCSV : BaseFunction - { - public override Categories Invoke(ReadStream stream) - { - var record = new List(); - using(var reader = new CsvReader(stream, false)) - { - while(reader.LoadLine(out var columns)) - { - if(columns > 0) - { - reader.Get(out int point, 0); - record.Add(point); - } - } - } - if(record.Count == 0) - { - throw new XTMFRuntimeException(this, "Unable to create Categories object with no contained categories."); - } - string error = null; - var ret = Categories.CreateCategories(record, ref error); - if(ret == null) - { - throw new XTMFRuntimeException(this, error); - } - return ret; - } - } -} diff --git a/UpdateReferences.bat b/UpdateReferences.bat deleted file mode 100755 index 246471c..0000000 --- a/UpdateReferences.bat +++ /dev/null @@ -1,5 +0,0 @@ -@Echo Off -cd XTMF2 -git fetch --all -git reset --hard origin/InnerRing -cd .. diff --git a/XTMF2 b/XTMF2 deleted file mode 160000 index 9e3284d..0000000 --- a/XTMF2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9e3284d9e460afc543ee2c7ae9d0eb0b2ee9189e diff --git a/TMG-Framework/src/TMG-Framework/Construct/ConstructTimePeriodFromTimes.cs b/src/TMG-Framework/Construct/ConstructTimePeriodFromTimes.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Construct/ConstructTimePeriodFromTimes.cs rename to src/TMG-Framework/Construct/ConstructTimePeriodFromTimes.cs diff --git a/TMG-Framework/src/TMG-Framework/Convert/ConvertTimesToTimePeriod.cs b/src/TMG-Framework/Convert/ConvertTimesToTimePeriod.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Convert/ConvertTimesToTimePeriod.cs rename to src/TMG-Framework/Convert/ConvertTimesToTimePeriod.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/Categories.cs b/src/TMG-Framework/Data/Categories.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/Categories.cs rename to src/TMG-Framework/Data/Categories.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/CategoryIndex.cs b/src/TMG-Framework/Data/CategoryIndex.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/CategoryIndex.cs rename to src/TMG-Framework/Data/CategoryIndex.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/CategoryMap.cs b/src/TMG-Framework/Data/CategoryMap.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/CategoryMap.cs rename to src/TMG-Framework/Data/CategoryMap.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/Matrix.cs b/src/TMG-Framework/Data/Matrix.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/Matrix.cs rename to src/TMG-Framework/Data/Matrix.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/Range.cs b/src/TMG-Framework/Data/Range.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/Range.cs rename to src/TMG-Framework/Data/Range.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/RangeSet.cs b/src/TMG-Framework/Data/RangeSet.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/RangeSet.cs rename to src/TMG-Framework/Data/RangeSet.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/RangeSetSet.cs b/src/TMG-Framework/Data/RangeSetSet.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/RangeSetSet.cs rename to src/TMG-Framework/Data/RangeSetSet.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/Time.cs b/src/TMG-Framework/Data/Time.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/Time.cs rename to src/TMG-Framework/Data/Time.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/TimePeriod.cs b/src/TMG-Framework/Data/TimePeriod.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/TimePeriod.cs rename to src/TMG-Framework/Data/TimePeriod.cs diff --git a/TMG-Framework/src/TMG-Framework/Data/Vector.cs b/src/TMG-Framework/Data/Vector.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Data/Vector.cs rename to src/TMG-Framework/Data/Vector.cs diff --git a/TMG-Framework/src/TMG-Framework/FileOperations/CopyFile.cs b/src/TMG-Framework/FileOperations/CopyFile.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/FileOperations/CopyFile.cs rename to src/TMG-Framework/FileOperations/CopyFile.cs diff --git a/TMG-Framework/src/TMG-Framework/FileOperations/DeleteFile.cs b/src/TMG-Framework/FileOperations/DeleteFile.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/FileOperations/DeleteFile.cs rename to src/TMG-Framework/FileOperations/DeleteFile.cs diff --git a/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs b/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs new file mode 100644 index 0000000..e8ab0ae --- /dev/null +++ b/src/TMG-Framework/Loading/LoadCategoriesFromCSV.cs @@ -0,0 +1,87 @@ +/* + Copyright 2017-2018 University of Toronto + + This file is part of TMG-Framework for XTMF2. + + TMG-Framework for XTMF2 is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + TMG-Framework for XTMF2 is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with TMG-Framework for XTMF2. If not, see . +*/ +using System; +using System.Collections.Generic; +using System.Text; +using TMG.Utilities; +using XTMF2; + +namespace TMG.Loading; + +[Module(Name = "Load Categories From CSV", Description = "Loads categories where each row has a different sparse index.", + DocumentationLink = "http://tmg.utoronto.ca/doc/2.0")] +public sealed class LoadCategoriesFromCSV : BaseFunction +{ + public override Categories Invoke(ReadStream stream) + { + var record = new List(); + using (var reader = new CsvReader(stream, false)) + { + while (reader.LoadLine(out var columns)) + { + if (columns > 0) + { + reader.Get(out int point, 0); + record.Add(point); + } + } + } + if (record.Count == 0) + { + throw new XTMFRuntimeException(this, "Unable to create Categories object with no contained categories."); + } + string error = null; + var ret = Categories.CreateCategories(record, ref error) + ?? throw new XTMFRuntimeException(this, error); + return ret; + } +} + +[Module(Name = "Load Categories From CSV", Description = "Loads categories where each row has a different sparse index.", + DocumentationLink = "http://tmg.utoronto.ca/doc/2.0")] +public sealed class LoadCategoriesFromCSVF : BaseFunction +{ + [SubModule(Name = "Input", Required = true, Description = "The CSV file to read from.", Index = 0)] + public IFunction Input = null!; + + public override Categories Invoke() + { + var record = new List(); + using var stream = Input.Invoke(); + using var reader = new CsvReader(stream, false); + + while (reader.LoadLine(out var columns)) + { + if (columns > 0) + { + reader.Get(out int point, 0); + record.Add(point); + } + } + + if (record.Count == 0) + { + throw new XTMFRuntimeException(this, "Unable to create Categories object with no contained categories."); + } + string error = null; + var ret = Categories.CreateCategories(record, ref error) + ?? throw new XTMFRuntimeException(this, error); + return ret; + } +} \ No newline at end of file diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadCategoryMapFromThirdNormalizedCSV.cs b/src/TMG-Framework/Loading/LoadCategoryMapFromThirdNormalizedCSV.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Loading/LoadCategoryMapFromThirdNormalizedCSV.cs rename to src/TMG-Framework/Loading/LoadCategoryMapFromThirdNormalizedCSV.cs diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromCSVMatrix.cs b/src/TMG-Framework/Loading/LoadMatrixFromCSVMatrix.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromCSVMatrix.cs rename to src/TMG-Framework/Loading/LoadMatrixFromCSVMatrix.cs diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromCSVThirdNormalized.cs b/src/TMG-Framework/Loading/LoadMatrixFromCSVThirdNormalized.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromCSVThirdNormalized.cs rename to src/TMG-Framework/Loading/LoadMatrixFromCSVThirdNormalized.cs diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromMTX.cs b/src/TMG-Framework/Loading/LoadMatrixFromMTX.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Loading/LoadMatrixFromMTX.cs rename to src/TMG-Framework/Loading/LoadMatrixFromMTX.cs diff --git a/TMG-Framework/src/TMG-Framework/Loading/LoadVectorFromCSV.cs b/src/TMG-Framework/Loading/LoadVectorFromCSV.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Loading/LoadVectorFromCSV.cs rename to src/TMG-Framework/Loading/LoadVectorFromCSV.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/ASTNode.cs b/src/TMG-Framework/Processing/AST/ASTNode.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/ASTNode.cs rename to src/TMG-Framework/Processing/AST/ASTNode.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Add.cs b/src/TMG-Framework/Processing/AST/Add.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Add.cs rename to src/TMG-Framework/Processing/AST/Add.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareAnd.cs b/src/TMG-Framework/Processing/AST/CompareAnd.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareAnd.cs rename to src/TMG-Framework/Processing/AST/CompareAnd.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareEqual.cs b/src/TMG-Framework/Processing/AST/CompareEqual.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareEqual.cs rename to src/TMG-Framework/Processing/AST/CompareEqual.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareGreaterThan.cs b/src/TMG-Framework/Processing/AST/CompareGreaterThan.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareGreaterThan.cs rename to src/TMG-Framework/Processing/AST/CompareGreaterThan.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareGreaterThanOrEqual.cs b/src/TMG-Framework/Processing/AST/CompareGreaterThanOrEqual.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareGreaterThanOrEqual.cs rename to src/TMG-Framework/Processing/AST/CompareGreaterThanOrEqual.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareNotEquals.cs b/src/TMG-Framework/Processing/AST/CompareNotEquals.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareNotEquals.cs rename to src/TMG-Framework/Processing/AST/CompareNotEquals.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/CompareOr.cs b/src/TMG-Framework/Processing/AST/CompareOr.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/CompareOr.cs rename to src/TMG-Framework/Processing/AST/CompareOr.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Compiler.cs b/src/TMG-Framework/Processing/AST/Compiler.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Compiler.cs rename to src/TMG-Framework/Processing/AST/Compiler.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Divide.cs b/src/TMG-Framework/Processing/AST/Divide.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Divide.cs rename to src/TMG-Framework/Processing/AST/Divide.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Exponent.cs b/src/TMG-Framework/Processing/AST/Exponent.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Exponent.cs rename to src/TMG-Framework/Processing/AST/Exponent.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Expression.cs b/src/TMG-Framework/Processing/AST/Expression.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Expression.cs rename to src/TMG-Framework/Processing/AST/Expression.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/FunctionCall.cs b/src/TMG-Framework/Processing/AST/FunctionCall.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/FunctionCall.cs rename to src/TMG-Framework/Processing/AST/FunctionCall.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/FusedMultiplyAdd.cs b/src/TMG-Framework/Processing/AST/FusedMultiplyAdd.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/FusedMultiplyAdd.cs rename to src/TMG-Framework/Processing/AST/FusedMultiplyAdd.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Multiply.cs b/src/TMG-Framework/Processing/AST/Multiply.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Multiply.cs rename to src/TMG-Framework/Processing/AST/Multiply.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Negate.cs b/src/TMG-Framework/Processing/AST/Negate.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Negate.cs rename to src/TMG-Framework/Processing/AST/Negate.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Subtract.cs b/src/TMG-Framework/Processing/AST/Subtract.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Subtract.cs rename to src/TMG-Framework/Processing/AST/Subtract.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AST/Variable.cs b/src/TMG-Framework/Processing/AST/Variable.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AST/Variable.cs rename to src/TMG-Framework/Processing/AST/Variable.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/AppendMatrixValueToCSV.cs b/src/TMG-Framework/Processing/AppendMatrixValueToCSV.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/AppendMatrixValueToCSV.cs rename to src/TMG-Framework/Processing/AppendMatrixValueToCSV.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/Evaluate2DGravityModel.cs b/src/TMG-Framework/Processing/Evaluate2DGravityModel.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/Evaluate2DGravityModel.cs rename to src/TMG-Framework/Processing/Evaluate2DGravityModel.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/EvaluateMatrix.cs b/src/TMG-Framework/Processing/EvaluateMatrix.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/EvaluateMatrix.cs rename to src/TMG-Framework/Processing/EvaluateMatrix.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/EvaluateScalar.cs b/src/TMG-Framework/Processing/EvaluateScalar.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/EvaluateScalar.cs rename to src/TMG-Framework/Processing/EvaluateScalar.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/EvaluateVector.cs b/src/TMG-Framework/Processing/EvaluateVector.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/EvaluateVector.cs rename to src/TMG-Framework/Processing/EvaluateVector.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/ExecutePipelineInOrderParallel.cs b/src/TMG-Framework/Processing/ExecutePipelineInOrderParallel.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/ExecutePipelineInOrderParallel.cs rename to src/TMG-Framework/Processing/ExecutePipelineInOrderParallel.cs diff --git a/TMG-Framework/src/TMG-Framework/Processing/IntegerizeMatrix.cs b/src/TMG-Framework/Processing/IntegerizeMatrix.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Processing/IntegerizeMatrix.cs rename to src/TMG-Framework/Processing/IntegerizeMatrix.cs diff --git a/TMG-Framework/src/TMG-Framework/Saving/SaveMatrixAsCSV.cs b/src/TMG-Framework/Saving/SaveMatrixAsCSV.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Saving/SaveMatrixAsCSV.cs rename to src/TMG-Framework/Saving/SaveMatrixAsCSV.cs diff --git a/TMG-Framework/src/TMG-Framework/Saving/SaveMatrixAsMTX.cs b/src/TMG-Framework/Saving/SaveMatrixAsMTX.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Saving/SaveMatrixAsMTX.cs rename to src/TMG-Framework/Saving/SaveMatrixAsMTX.cs diff --git a/TMG-Framework/src/TMG-Framework/Saving/SaveVectorAsCSV.cs b/src/TMG-Framework/Saving/SaveVectorAsCSV.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Saving/SaveVectorAsCSV.cs rename to src/TMG-Framework/Saving/SaveVectorAsCSV.cs diff --git a/TMG-Framework/src/TMG-Framework/Select/SelectGivenTime.cs b/src/TMG-Framework/Select/SelectGivenTime.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Select/SelectGivenTime.cs rename to src/TMG-Framework/Select/SelectGivenTime.cs diff --git a/TMG-Framework/src/TMG-Framework/TMG-Framework.csproj b/src/TMG-Framework/TMG-Framework.csproj similarity index 64% rename from TMG-Framework/src/TMG-Framework/TMG-Framework.csproj rename to src/TMG-Framework/TMG-Framework.csproj index e65b717..527ec9e 100644 --- a/TMG-Framework/src/TMG-Framework/TMG-Framework.csproj +++ b/src/TMG-Framework/TMG-Framework.csproj @@ -6,6 +6,9 @@ University of Toronto University of Toronto A set of modules for XTMF2 to provide assistance in Travel Demand Modelling. + false + false + ..\..\..\XTMF2-Dev\Modules\ @@ -20,11 +23,12 @@ - - - - - + + ..\..\..\XTMF2-Dev\XTMF2.dll + + + ..\..\..\XTMF2-Dev\XTMF2.Interfaces.dll + diff --git a/TMG-Framework/src/TMG-Framework/Utilities/CSVReader.cs b/src/TMG-Framework/Utilities/CSVReader.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/CSVReader.cs rename to src/TMG-Framework/Utilities/CSVReader.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/ExceptionHelper.cs b/src/TMG-Framework/Utilities/ExceptionHelper.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/ExceptionHelper.cs rename to src/TMG-Framework/Utilities/ExceptionHelper.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/ObjectStream.cs b/src/TMG-Framework/Utilities/ObjectStream.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/ObjectStream.cs rename to src/TMG-Framework/Utilities/ObjectStream.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/SpanHelper.cs b/src/TMG-Framework/Utilities/SpanHelper.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/SpanHelper.cs rename to src/TMG-Framework/Utilities/SpanHelper.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Add.cs b/src/TMG-Framework/Utilities/VectorHelper/Add.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Add.cs rename to src/TMG-Framework/Utilities/VectorHelper/Add.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagAnd.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagAnd.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagAnd.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagAnd.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfEquals.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfEquals.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfEquals.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfEquals.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThan.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThan.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThan.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThan.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThanOrEqual.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThanOrEqual.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThanOrEqual.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfGreaterThanOrEqual.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThan.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThan.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThan.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThan.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThanOrEqual.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThanOrEqual.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThanOrEqual.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfLessThanOrEqual.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfNotEquals.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfNotEquals.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfNotEquals.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagIfNotEquals.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagOr.cs b/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagOr.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagOr.cs rename to src/TMG-Framework/Utilities/VectorHelper/Conditions/FlagOr.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Divide.cs b/src/TMG-Framework/Utilities/VectorHelper/Divide.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Divide.cs rename to src/TMG-Framework/Utilities/VectorHelper/Divide.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Exp.cs b/src/TMG-Framework/Utilities/VectorHelper/Exp.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Exp.cs rename to src/TMG-Framework/Utilities/VectorHelper/Exp.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/FusedMultiplyAdd.cs b/src/TMG-Framework/Utilities/VectorHelper/FusedMultiplyAdd.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/FusedMultiplyAdd.cs rename to src/TMG-Framework/Utilities/VectorHelper/FusedMultiplyAdd.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/If.cs b/src/TMG-Framework/Utilities/VectorHelper/If.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/If.cs rename to src/TMG-Framework/Utilities/VectorHelper/If.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Log.cs b/src/TMG-Framework/Utilities/VectorHelper/Log.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Log.cs rename to src/TMG-Framework/Utilities/VectorHelper/Log.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Multiply.cs b/src/TMG-Framework/Utilities/VectorHelper/Multiply.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Multiply.cs rename to src/TMG-Framework/Utilities/VectorHelper/Multiply.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Pow.cs b/src/TMG-Framework/Utilities/VectorHelper/Pow.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Pow.cs rename to src/TMG-Framework/Utilities/VectorHelper/Pow.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Subtract.cs b/src/TMG-Framework/Utilities/VectorHelper/Subtract.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/Subtract.cs rename to src/TMG-Framework/Utilities/VectorHelper/Subtract.cs diff --git a/TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs b/src/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs similarity index 100% rename from TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs rename to src/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs diff --git a/TMG-Framework/tests/PerformanceTest/Helper.cs b/tests/PerformanceTest/Helper.cs similarity index 100% rename from TMG-Framework/tests/PerformanceTest/Helper.cs rename to tests/PerformanceTest/Helper.cs diff --git a/TMG-Framework/tests/PerformanceTest/MapHelper.cs b/tests/PerformanceTest/MapHelper.cs similarity index 100% rename from TMG-Framework/tests/PerformanceTest/MapHelper.cs rename to tests/PerformanceTest/MapHelper.cs diff --git a/TMG-Framework/tests/PerformanceTest/PerformanceTest.csproj b/tests/PerformanceTest/PerformanceTest.csproj similarity index 100% rename from TMG-Framework/tests/PerformanceTest/PerformanceTest.csproj rename to tests/PerformanceTest/PerformanceTest.csproj diff --git a/TMG-Framework/tests/PerformanceTest/Program.cs b/tests/PerformanceTest/Program.cs similarity index 100% rename from TMG-Framework/tests/PerformanceTest/Program.cs rename to tests/PerformanceTest/Program.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/ArbitaryParameterParser.cs b/tests/TMG-Framework.Test/ArbitaryParameterParser.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/ArbitaryParameterParser.cs rename to tests/TMG-Framework.Test/ArbitaryParameterParser.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Construct/TestConstructTimePeriodFromTimes.cs b/tests/TMG-Framework.Test/Construct/TestConstructTimePeriodFromTimes.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Construct/TestConstructTimePeriodFromTimes.cs rename to tests/TMG-Framework.Test/Construct/TestConstructTimePeriodFromTimes.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Convert/TestConvertTimesToTimePeriod.cs b/tests/TMG-Framework.Test/Convert/TestConvertTimesToTimePeriod.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Convert/TestConvertTimesToTimePeriod.cs rename to tests/TMG-Framework.Test/Convert/TestConvertTimesToTimePeriod.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/CategoriesTest.cs b/tests/TMG-Framework.Test/Data/CategoriesTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/CategoriesTest.cs rename to tests/TMG-Framework.Test/Data/CategoriesTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/CategoryMapTest.cs b/tests/TMG-Framework.Test/Data/CategoryMapTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/CategoryMapTest.cs rename to tests/TMG-Framework.Test/Data/CategoryMapTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/MatrixTest.cs b/tests/TMG-Framework.Test/Data/MatrixTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/MatrixTest.cs rename to tests/TMG-Framework.Test/Data/MatrixTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/RangeSetTest.cs b/tests/TMG-Framework.Test/Data/RangeSetTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/RangeSetTest.cs rename to tests/TMG-Framework.Test/Data/RangeSetTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/RangeTest.cs b/tests/TMG-Framework.Test/Data/RangeTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/RangeTest.cs rename to tests/TMG-Framework.Test/Data/RangeTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Data/VectorTest.cs b/tests/TMG-Framework.Test/Data/VectorTest.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Data/VectorTest.cs rename to tests/TMG-Framework.Test/Data/VectorTest.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/EnsureRuntimeLaunch.cs b/tests/TMG-Framework.Test/EnsureRuntimeLaunch.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/EnsureRuntimeLaunch.cs rename to tests/TMG-Framework.Test/EnsureRuntimeLaunch.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs b/tests/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs rename to tests/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadMapFromCSV.cs b/tests/TMG-Framework.Test/Loading/TestLoadMapFromCSV.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadMapFromCSV.cs rename to tests/TMG-Framework.Test/Loading/TestLoadMapFromCSV.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadMatrix.cs b/tests/TMG-Framework.Test/Loading/TestLoadMatrix.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadMatrix.cs rename to tests/TMG-Framework.Test/Loading/TestLoadMatrix.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadVector.cs b/tests/TMG-Framework.Test/Loading/TestLoadVector.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadVector.cs rename to tests/TMG-Framework.Test/Loading/TestLoadVector.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestAppendMatrixValueToCSV.cs b/tests/TMG-Framework.Test/Processing/TestAppendMatrixValueToCSV.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestAppendMatrixValueToCSV.cs rename to tests/TMG-Framework.Test/Processing/TestAppendMatrixValueToCSV.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateMatrix.cs b/tests/TMG-Framework.Test/Processing/TestEvaluateMatrix.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateMatrix.cs rename to tests/TMG-Framework.Test/Processing/TestEvaluateMatrix.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateScalar.cs b/tests/TMG-Framework.Test/Processing/TestEvaluateScalar.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateScalar.cs rename to tests/TMG-Framework.Test/Processing/TestEvaluateScalar.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateVector.cs b/tests/TMG-Framework.Test/Processing/TestEvaluateVector.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestEvaluateVector.cs rename to tests/TMG-Framework.Test/Processing/TestEvaluateVector.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestExecutePipelineInOrderParallel.cs b/tests/TMG-Framework.Test/Processing/TestExecutePipelineInOrderParallel.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestExecutePipelineInOrderParallel.cs rename to tests/TMG-Framework.Test/Processing/TestExecutePipelineInOrderParallel.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestGravityModel.cs b/tests/TMG-Framework.Test/Processing/TestGravityModel.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestGravityModel.cs rename to tests/TMG-Framework.Test/Processing/TestGravityModel.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Processing/TestIntegerizeMatrix.cs b/tests/TMG-Framework.Test/Processing/TestIntegerizeMatrix.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Processing/TestIntegerizeMatrix.cs rename to tests/TMG-Framework.Test/Processing/TestIntegerizeMatrix.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsCSV.cs b/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsCSV.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsCSV.cs rename to tests/TMG-Framework.Test/Saving/TestSaveMatrixAsCSV.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsMTX.cs b/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsMTX.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveMatrixAsMTX.cs rename to tests/TMG-Framework.Test/Saving/TestSaveMatrixAsMTX.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveVectorAsCSV.cs b/tests/TMG-Framework.Test/Saving/TestSaveVectorAsCSV.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Saving/TestSaveVectorAsCSV.cs rename to tests/TMG-Framework.Test/Saving/TestSaveVectorAsCSV.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Select/TestSelectGivenTime.cs b/tests/TMG-Framework.Test/Select/TestSelectGivenTime.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Select/TestSelectGivenTime.cs rename to tests/TMG-Framework.Test/Select/TestSelectGivenTime.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/TMG-Framework.Test.csproj b/tests/TMG-Framework.Test/TMG-Framework.Test.csproj similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/TMG-Framework.Test.csproj rename to tests/TMG-Framework.Test/TMG-Framework.Test.csproj diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/Helper.cs b/tests/TMG-Framework.Test/Utilities/Helper.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/Helper.cs rename to tests/TMG-Framework.Test/Utilities/Helper.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/MapHelper.cs b/tests/TMG-Framework.Test/Utilities/MapHelper.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/MapHelper.cs rename to tests/TMG-Framework.Test/Utilities/MapHelper.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/MatrixHelper.cs b/tests/TMG-Framework.Test/Utilities/MatrixHelper.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/MatrixHelper.cs rename to tests/TMG-Framework.Test/Utilities/MatrixHelper.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/TestCSVReader.cs b/tests/TMG-Framework.Test/Utilities/TestCSVReader.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/TestCSVReader.cs rename to tests/TMG-Framework.Test/Utilities/TestCSVReader.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/TestCompiler.cs b/tests/TMG-Framework.Test/Utilities/TestCompiler.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/TestCompiler.cs rename to tests/TMG-Framework.Test/Utilities/TestCompiler.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagAnd.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagAnd.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagAnd.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagAnd.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfEquals.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfEquals.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfEquals.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfEquals.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThan.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThan.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThan.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThan.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThanOrEqual.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThanOrEqual.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThanOrEqual.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfGreaterThanOrEqual.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThan.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThan.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThan.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThan.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThanOrEqual.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThanOrEqual.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThanOrEqual.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfLessThanOrEqual.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfNotEquals.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfNotEquals.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfNotEquals.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagIfNotEquals.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagOr.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagOr.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagOr.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/Conditions/TestFlagOr.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestAdd.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestAdd.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestAdd.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestAdd.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestDivide.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestDivide.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestDivide.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestDivide.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestExp.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestExp.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestExp.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestExp.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestFusedMultiplyAdd.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestFusedMultiplyAdd.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestFusedMultiplyAdd.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestFusedMultiplyAdd.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestIf.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestIf.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestIf.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestIf.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestLog.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestLog.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestLog.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestLog.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestMultiply.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestMultiply.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestMultiply.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestMultiply.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestPow.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestPow.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestPow.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestPow.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestSubtract.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/TestSubtract.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/TestSubtract.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/TestSubtract.cs diff --git a/TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/VectorHelper.cs b/tests/TMG-Framework.Test/Utilities/VectorHelper/VectorHelper.cs similarity index 100% rename from TMG-Framework/tests/TMG-Framework.Test/Utilities/VectorHelper/VectorHelper.cs rename to tests/TMG-Framework.Test/Utilities/VectorHelper/VectorHelper.cs From e29ab929226513f64c6bf65927bb73b8da41bc4c Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:01:00 -0400 Subject: [PATCH 02/12] Fix CI --- .github/workflows/BuildAndTest.yml | 6 ++---- README.md | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 320daa7..1d19f54 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -15,10 +15,8 @@ jobs: dotnet-version: 10.0.101 - name: Build with dotnet run: | - cd TMG-Framework - dotnet build --configuration Release + dotnet build -c Release - name: Unit Tests run: | - cd TMG-Framework - dotnet test + dotnet test -c Release diff --git a/README.md b/README.md index 36387a7..3229844 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ operating XTMF2. ### Requirements -1. DotNet Core 3.1+ SDK +1. DotNet 10.0+ SDK ### Clone the TMG-Framework repository From 6ab99f85ceb6a2c5f377b4384d1ddae4945d3842 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:05:49 -0400 Subject: [PATCH 03/12] Update test references --- tests/PerformanceTest/PerformanceTest.csproj | 9 +++++++++ tests/TMG-Framework.Test/TMG-Framework.Test.csproj | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/PerformanceTest/PerformanceTest.csproj b/tests/PerformanceTest/PerformanceTest.csproj index bb964b8..011c394 100644 --- a/tests/PerformanceTest/PerformanceTest.csproj +++ b/tests/PerformanceTest/PerformanceTest.csproj @@ -14,4 +14,13 @@ + + + ..\..\..\XTMF2-Dev\XTMF2.dll + + + ..\..\..\XTMF2-Dev\XTMF2.Interfaces.dll + + + diff --git a/tests/TMG-Framework.Test/TMG-Framework.Test.csproj b/tests/TMG-Framework.Test/TMG-Framework.Test.csproj index 9d1872a..af1e0ae 100644 --- a/tests/TMG-Framework.Test/TMG-Framework.Test.csproj +++ b/tests/TMG-Framework.Test/TMG-Framework.Test.csproj @@ -19,12 +19,16 @@ - - + + ..\..\..\XTMF2-Dev\XTMF2.dll + + + ..\..\..\XTMF2-Dev\XTMF2.Interfaces.dll + From 66c1b26da78511f57aead72456ec77ed623efc98 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:36:28 -0400 Subject: [PATCH 04/12] Update CI2 --- .github/workflows/BuildAndTest.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 1d19f54..fd69e8e 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -6,14 +6,18 @@ jobs: build: runs-on: windows-2025 steps: - - uses: actions/checkout@v1 - with: - submodules: recursive - name: Setup .NetCore uses: actions/setup-dotnet@v1 with: dotnet-version: 10.0.101 - - name: Build with dotnet + - uses: actions/checkout@v1 + with: + repository: TravelModellingGroup/XTMF2 + - name: Build XTMF2 + run: | + dotnet build -c Release + - uses: actions/checkout@v1 + - name: Build TMG-Framework run: | dotnet build -c Release - name: Unit Tests From 39c06939d8a50bdf0a6ccf8092c35b0d6d2b6ff9 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:38:32 -0400 Subject: [PATCH 05/12] Update CI3 --- .github/workflows/BuildAndTest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index fd69e8e..269be86 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v1 with: repository: TravelModellingGroup/XTMF2 + ref: refs/heads/dev - name: Build XTMF2 run: | dotnet build -c Release From f02be150b96faf87ba27c05c008a0e087433a872 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:45:38 -0400 Subject: [PATCH 06/12] Debug CI --- .github/workflows/BuildAndTest.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 269be86..e72a03f 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,8 +13,11 @@ jobs: - uses: actions/checkout@v1 with: repository: TravelModellingGroup/XTMF2 - ref: refs/heads/dev - - name: Build XTMF2 + ref: tree/dev + - name: Debug + run: | + ls -hla . + - name: Build XTMF2 run: | dotnet build -c Release - uses: actions/checkout@v1 From 57fc4634889ab6e1dc1e36662a69e1179a6f0b33 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:47:18 -0400 Subject: [PATCH 07/12] Debug CI --- .github/workflows/BuildAndTest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index e72a03f..2b63cbe 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,7 +13,6 @@ jobs: - uses: actions/checkout@v1 with: repository: TravelModellingGroup/XTMF2 - ref: tree/dev - name: Debug run: | ls -hla . From 80c88692397569e8b6770dc17e7b541bbb2ca59b Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:50:07 -0400 Subject: [PATCH 08/12] Debug CI --- .github/workflows/BuildAndTest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 2b63cbe..c757557 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -13,6 +13,7 @@ jobs: - uses: actions/checkout@v1 with: repository: TravelModellingGroup/XTMF2 + ref: origin/dev - name: Debug run: | ls -hla . From 19e6d63282fa81b38171161b3ca2a1bf88556418 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:51:47 -0400 Subject: [PATCH 09/12] Debug CI --- .github/workflows/BuildAndTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index c757557..c7f281c 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -16,7 +16,7 @@ jobs: ref: origin/dev - name: Debug run: | - ls -hla . + ls . - name: Build XTMF2 run: | dotnet build -c Release From 924369508f4389ae1074517b849927dd3c5e0ad0 Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:56:58 -0400 Subject: [PATCH 10/12] Debug CI --- .github/workflows/BuildAndTest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index c7f281c..c898dfc 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -14,17 +14,17 @@ jobs: with: repository: TravelModellingGroup/XTMF2 ref: origin/dev - - name: Debug - run: | - ls . - name: Build XTMF2 run: | + cd "D:\a\TMG-Framework\XTMF2" dotnet build -c Release - uses: actions/checkout@v1 - name: Build TMG-Framework run: | + cd "D:\a\TMG-Framework\TMG-Framework" dotnet build -c Release - name: Unit Tests run: | + cd "D:\a\TMG-Framework\TMG-Framework" dotnet test -c Release From 96011982f398fdc0c31c90cf853ae8d4be0991fb Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 11:59:20 -0400 Subject: [PATCH 11/12] Debug CI --- .github/workflows/BuildAndTest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index c898dfc..1aa1d70 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -16,15 +16,15 @@ jobs: ref: origin/dev - name: Build XTMF2 run: | - cd "D:\a\TMG-Framework\XTMF2" + cd "XTMF2" dotnet build -c Release - uses: actions/checkout@v1 - name: Build TMG-Framework run: | - cd "D:\a\TMG-Framework\TMG-Framework" + cd "TMG-Framework" dotnet build -c Release - name: Unit Tests run: | - cd "D:\a\TMG-Framework\TMG-Framework" + cd "TMG-Framework" dotnet test -c Release From c9594820b4909aab42c9a54f7d23d07c65da132b Mon Sep 17 00:00:00 2001 From: James Vaughan Date: Wed, 17 Jun 2026 12:02:09 -0400 Subject: [PATCH 12/12] Debug CI --- .github/workflows/BuildAndTest.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/BuildAndTest.yml b/.github/workflows/BuildAndTest.yml index 1aa1d70..5091006 100644 --- a/.github/workflows/BuildAndTest.yml +++ b/.github/workflows/BuildAndTest.yml @@ -16,15 +16,13 @@ jobs: ref: origin/dev - name: Build XTMF2 run: | - cd "XTMF2" + cd "../XTMF2" dotnet build -c Release - uses: actions/checkout@v1 - name: Build TMG-Framework run: | - cd "TMG-Framework" dotnet build -c Release - name: Unit Tests run: | - cd "TMG-Framework" dotnet test -c Release