From 78d46fbd0daf727c49473a7c168698105584eaba Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 14 Oct 2020 10:27:33 +0200 Subject: [PATCH] Refactored evaluation and uaccess dll namespaces --- .../{CollectionContext/Importer => }/IMmcfeResultImporter.cs | 2 +- .../Custom/Mmcfe/{Results => }/MmcfeEnergyDataPoint.cs | 0 .../Mmcfe/{Evaluation => }/MmcfeEnergyDataPointEvaluator.cs | 2 +- .../Custom/Mmcfe/{Evaluation => }/MmcfeEnergyEvaluator.cs | 2 +- .../Custom/Mmcfe/{Results => }/MmcfeEnergyState.cs | 2 +- .../{CollectionContext/Context => }/MmcfeExtendedLogEntry.cs | 0 .../Importer => }/MmcfeJobFolderImporter.cs | 0 .../Context => }/MmcfeLogCollectionDbContext.cs | 0 .../Custom/Mmcfe/{Context => }/MmcfeLogDbContext.cs | 0 .../{CollectionContext/Context => }/MmcfeLogEnergyEntry.cs | 0 .../Custom/Mmcfe/{Context => }/MmcfeLogEntry.cs | 0 .../Custom/Mmcfe/{Context => }/MmcfeLogEvaluationContext.cs | 0 .../{CollectionContext/Context => }/MmcfeLogMetaEntry.cs | 0 .../{Queries/Base => Helper}/Equations.cs | 2 +- .../Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs | 3 ++- .../{Queries/Base => Helper}/UnitConversions.cs | 2 +- .../Mocassin.Tools.Evaluation.csproj | 4 ---- .../{Counting/Queries => }/CellSiteCoordinationEvaluation.cs | 1 + .../Queries/{Special/Queries => }/CubicOnsagerEvaluation.cs | 3 ++- .../Queries/{Counting/Result => Data}/CoordinationShell.cs | 2 +- .../Queries/{Mobility/Result => Data}/EnsembleDiffusion.cs | 2 +- .../Queries/{Tracking/Result => Data}/EnsembleDisplacement.cs | 2 +- .../Queries/{Meta/Result => Data}/EnsembleMetaData.cs | 2 +- .../Queries/{Mobility/Result => Data}/EnsembleMobility.cs | 2 +- .../Queries/{Tracking/Result => Data}/GlobalTrackerResult.cs | 2 +- .../Queries/{Meta/Result => Data}/LatticeMetaData.cs | 2 +- .../Queries/{Tracking/Result => Data}/MobileTrackerResult.cs | 2 +- .../Queries/{Counting/Result => Data}/SiteCoordination.cs | 2 +- .../Queries/{Tracking/Result => Data}/StaticTrackerResult.cs | 2 +- .../Queries/{Mobility/Result => Data}/TransitionMobility.cs | 2 +- .../{Mobility/Queries => }/EnsembleDiffusionEvaluation.cs | 3 ++- .../{Tracking/Queries => }/EnsembleDisplacementEvaluation.cs | 2 ++ .../Queries/{Meta/Queries => }/EnsembleMetaEvaluation.cs | 1 + .../{Mobility/Queries => }/EnsembleMobilityEvaluation.cs | 3 ++- .../{Tracking/Queries => }/GlobalTrackingEvaluation.cs | 2 ++ .../Queries/{Meta/Queries => }/LatticeMetaEvaluation.cs | 2 ++ .../{Counting/Queries => }/LocalSiteCoordinationEvaluation.cs | 1 + .../{Counting/Queries => }/LocalSiteDensityEvaluation.cs | 0 .../{Tracking/Queries => }/MobileTrackingEvaluation.cs | 2 ++ .../Queries/{Counting/Queries => }/ParticleCountEvaluation.cs | 0 .../{Counting/Queries => }/SiteEnvironmentEvaluation.cs | 0 .../{Tracking/Queries => }/SquaredDisplacementEvaluation.cs | 1 + .../{Tracking/Queries => }/StaticTrackingEvaluation.cs | 2 ++ .../{Mobility/Queries => }/TransitionMobilityEvaluation.cs | 3 ++- .../Readers/{Base => }/BinaryStructureReader.cs | 2 +- .../Components => Data}/DynamicHistogramHeader.cs | 2 +- .../Readers/{McsReader/Components => Data}/McsCycleCounter.cs | 2 +- .../Readers/{McsReader/Components => Data}/McsHeader.cs | 2 +- .../{McsReader/Components => Data}/McsJumpHistogram.cs | 2 +- .../{McsReader/Components => Data}/McsJumpStatistic.cs | 2 +- .../Readers/{McsReader/Components => Data}/McsMetaData.cs | 2 +- .../{McsReader/Components => Data}/McsMovementTracker.cs | 2 +- .../Readers/{HistogramReader => }/DynamicHistogramReader.cs | 3 +-- .../Readers/{McsReader => }/McsContentReader.cs | 3 +-- .../Readers/{MmcfeReader => }/MmcfeLogReader.cs | 1 - 55 files changed, 51 insertions(+), 39 deletions(-) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Importer => }/IMmcfeResultImporter.cs (96%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Results => }/MmcfeEnergyDataPoint.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Evaluation => }/MmcfeEnergyDataPointEvaluator.cs (99%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Evaluation => }/MmcfeEnergyEvaluator.cs (99%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Results => }/MmcfeEnergyState.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Context => }/MmcfeExtendedLogEntry.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Importer => }/MmcfeJobFolderImporter.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Context => }/MmcfeLogCollectionDbContext.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Context => }/MmcfeLogDbContext.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Context => }/MmcfeLogEnergyEntry.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Context => }/MmcfeLogEntry.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{Context => }/MmcfeLogEvaluationContext.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/{CollectionContext/Context => }/MmcfeLogMetaEntry.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/{Queries/Base => Helper}/Equations.cs (99%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/{Queries/Base => Helper}/UnitConversions.cs (93%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Queries => }/CellSiteCoordinationEvaluation.cs (99%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Special/Queries => }/CubicOnsagerEvaluation.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Result => Data}/CoordinationShell.cs (96%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Result => Data}/EnsembleDiffusion.cs (96%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Result => Data}/EnsembleDisplacement.cs (97%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Meta/Result => Data}/EnsembleMetaData.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Result => Data}/EnsembleMobility.cs (96%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Result => Data}/GlobalTrackerResult.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Meta/Result => Data}/LatticeMetaData.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Result => Data}/MobileTrackerResult.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Result => Data}/SiteCoordination.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Result => Data}/StaticTrackerResult.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Result => Data}/TransitionMobility.cs (94%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Queries => }/EnsembleDiffusionEvaluation.cs (97%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Queries => }/EnsembleDisplacementEvaluation.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Meta/Queries => }/EnsembleMetaEvaluation.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Queries => }/EnsembleMobilityEvaluation.cs (97%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Queries => }/GlobalTrackingEvaluation.cs (96%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Meta/Queries => }/LatticeMetaEvaluation.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Queries => }/LocalSiteCoordinationEvaluation.cs (98%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Queries => }/LocalSiteDensityEvaluation.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Queries => }/MobileTrackingEvaluation.cs (94%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Queries => }/ParticleCountEvaluation.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Counting/Queries => }/SiteEnvironmentEvaluation.cs (100%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Queries => }/SquaredDisplacementEvaluation.cs (97%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Tracking/Queries => }/StaticTrackingEvaluation.cs (95%) rename src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/{Mobility/Queries => }/TransitionMobilityEvaluation.cs (97%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{Base => }/BinaryStructureReader.cs (98%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{HistogramReader/Components => Data}/DynamicHistogramHeader.cs (95%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsCycleCounter.cs (96%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsHeader.cs (97%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsJumpHistogram.cs (97%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsJumpStatistic.cs (95%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsMetaData.cs (97%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader/Components => Data}/McsMovementTracker.cs (98%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{HistogramReader => }/DynamicHistogramReader.cs (96%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{McsReader => }/McsContentReader.cs (98%) rename src/ModelBuilder/Mocassin.Tools.UAccess/Readers/{MmcfeReader => }/MmcfeLogReader.cs (98%) diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Importer/IMmcfeResultImporter.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/IMmcfeResultImporter.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Importer/IMmcfeResultImporter.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/IMmcfeResultImporter.cs index 91c954c4..88f8e764 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Importer/IMmcfeResultImporter.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/IMmcfeResultImporter.cs @@ -2,7 +2,7 @@ using System.Linq.Expressions; using Mocassin.Model.Translator.Database.Entities.Other.Meta; -namespace Mocassin.Tools.Evaluation.Custom.Mmcfe.Importer +namespace Mocassin.Tools.Evaluation.Custom.Mmcfe { /// /// Represents an importer for populating from raw simulation results diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Results/MmcfeEnergyDataPoint.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyDataPoint.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Results/MmcfeEnergyDataPoint.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyDataPoint.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyDataPointEvaluator.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyDataPointEvaluator.cs similarity index 99% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyDataPointEvaluator.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyDataPointEvaluator.cs index 67f6b4dd..191ce4db 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyDataPointEvaluator.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyDataPointEvaluator.cs @@ -7,8 +7,8 @@ using Microsoft.EntityFrameworkCore; using Mocassin.Framework.SQLiteCore; using Mocassin.Mathematics.Comparer; +using Mocassin.Tools.Evaluation.Helper; using Mocassin.Tools.Evaluation.PlotData; -using Mocassin.Tools.Evaluation.Queries.Base; namespace Mocassin.Tools.Evaluation.Custom.Mmcfe { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyEvaluator.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyEvaluator.cs similarity index 99% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyEvaluator.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyEvaluator.cs index 16b49086..0fe3d5cc 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Evaluation/MmcfeEnergyEvaluator.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyEvaluator.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using Mocassin.Framework.Extensions; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; using Mocassin.Tools.UAccess.Readers; namespace Mocassin.Tools.Evaluation.Custom.Mmcfe diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Results/MmcfeEnergyState.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyState.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Results/MmcfeEnergyState.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyState.cs index cb1f5d66..a84ab81d 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Results/MmcfeEnergyState.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeEnergyState.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; using System.Text; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; namespace Mocassin.Tools.Evaluation.Custom.Mmcfe { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeExtendedLogEntry.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeExtendedLogEntry.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeExtendedLogEntry.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeExtendedLogEntry.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Importer/MmcfeJobFolderImporter.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeJobFolderImporter.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Importer/MmcfeJobFolderImporter.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeJobFolderImporter.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogCollectionDbContext.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogCollectionDbContext.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogCollectionDbContext.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogCollectionDbContext.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogDbContext.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogDbContext.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogDbContext.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogDbContext.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogEnergyEntry.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEnergyEntry.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogEnergyEntry.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEnergyEntry.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogEntry.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEntry.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogEntry.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEntry.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogEvaluationContext.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEvaluationContext.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/Context/MmcfeLogEvaluationContext.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogEvaluationContext.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogMetaEntry.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogMetaEntry.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/CollectionContext/Context/MmcfeLogMetaEntry.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Custom/Mmcfe/MmcfeLogMetaEntry.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/Equations.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/Equations.cs similarity index 99% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/Equations.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/Equations.cs index 1ff8b359..981e4b46 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/Equations.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/Equations.cs @@ -4,7 +4,7 @@ using Mocassin.Mathematics.Extensions; using Mocassin.Mathematics.ValueTypes; -namespace Mocassin.Tools.Evaluation.Queries.Base +namespace Mocassin.Tools.Evaluation.Helper { /// /// Provides equations to calculate physical properties required by the evaluation system diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs index 4427a6ff..07e86474 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/MetaDataHelper.cs @@ -1,11 +1,12 @@ using System; using System.Linq; +using Mocassin.Mathematics.ValueTypes; using Mocassin.Model.Translator.Database.Entities.Other.Meta; namespace Mocassin.Tools.Evaluation.Helper { /// - /// Provides static methods that help with + /// Provides static methods that help with /// public static class MetaDataHelper { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/UnitConversions.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/UnitConversions.cs similarity index 93% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/UnitConversions.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/UnitConversions.cs index da645dfb..1dca3e54 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Base/UnitConversions.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Helper/UnitConversions.cs @@ -1,4 +1,4 @@ -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Helper { /// /// Stores the unit conversion information required to convert the internally used unit to typical SI representation diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj b/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj index 610f3eff..b3d770fa 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Mocassin.Tools.Evaluation.csproj @@ -17,10 +17,6 @@ - - - - diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/CellSiteCoordinationEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CellSiteCoordinationEvaluation.cs similarity index 99% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/CellSiteCoordinationEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CellSiteCoordinationEvaluation.cs index f9ded867..603fac1d 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/CellSiteCoordinationEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CellSiteCoordinationEvaluation.cs @@ -8,6 +8,7 @@ using Mocassin.Symmetry.Analysis; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Special/Queries/CubicOnsagerEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CubicOnsagerEvaluation.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Special/Queries/CubicOnsagerEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CubicOnsagerEvaluation.cs index b38b279f..908dfb6a 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Special/Queries/CubicOnsagerEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/CubicOnsagerEvaluation.cs @@ -3,7 +3,8 @@ using System.Linq; using Mocassin.Model.Particles; using Mocassin.Tools.Evaluation.Context; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/CoordinationShell.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/CoordinationShell.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/CoordinationShell.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/CoordinationShell.cs index 2a6ba138..d0de8b7f 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/CoordinationShell.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/CoordinationShell.cs @@ -1,6 +1,6 @@ using Mocassin.Tools.Evaluation.PlotData; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Describes the results of a for a single distance as a site coordination diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleDiffusion.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDiffusion.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleDiffusion.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDiffusion.cs index 52ede03f..445e782b 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleDiffusion.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDiffusion.cs @@ -1,7 +1,7 @@ using System; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Stores the simulation diffusion data of an ensemble diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/EnsembleDisplacement.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDisplacement.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/EnsembleDisplacement.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDisplacement.cs index 4bd9e39e..272c35d6 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/EnsembleDisplacement.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleDisplacement.cs @@ -2,7 +2,7 @@ using Mocassin.Mathematics.ValueTypes; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Struct that describes the movement of a ensemble in cartesian coordinates diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/EnsembleMetaData.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMetaData.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/EnsembleMetaData.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMetaData.cs index d619d4e0..d8e7adbf 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/EnsembleMetaData.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMetaData.cs @@ -1,7 +1,7 @@ using System; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Stores meta information for an ensemble of simulation particles diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleMobility.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMobility.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleMobility.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMobility.cs index 178ca7a9..718e785d 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/EnsembleMobility.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/EnsembleMobility.cs @@ -1,7 +1,7 @@ using System; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Contains the mobility data for a ensemble diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/GlobalTrackerResult.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/GlobalTrackerResult.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/GlobalTrackerResult.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/GlobalTrackerResult.cs index 7ffb411e..8773b844 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/GlobalTrackerResult.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/GlobalTrackerResult.cs @@ -1,7 +1,7 @@ using System; using Mocassin.Model.Translator.ModelContext; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Struct that contains the of a diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/LatticeMetaData.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/LatticeMetaData.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/LatticeMetaData.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/LatticeMetaData.cs index c7887b56..e884cf6c 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Result/LatticeMetaData.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/LatticeMetaData.cs @@ -1,6 +1,6 @@ using Mocassin.Mathematics.ValueTypes; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Stores the meta information for a single the simulation lattice diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/MobileTrackerResult.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/MobileTrackerResult.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/MobileTrackerResult.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/MobileTrackerResult.cs index fee20aab..9f35a9d2 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/MobileTrackerResult.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/MobileTrackerResult.cs @@ -2,7 +2,7 @@ using Mocassin.Mathematics.ValueTypes; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Struct that contains the tracking data of a single mobile diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/SiteCoordination.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/SiteCoordination.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/SiteCoordination.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/SiteCoordination.cs index b94a585c..33c5e520 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Result/SiteCoordination.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/SiteCoordination.cs @@ -4,7 +4,7 @@ using Mocassin.Symmetry.Analysis; using Mocassin.Tools.Evaluation.PlotData; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Describes a radial distribution around a position in the lattice as a set of items diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/StaticTrackerResult.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/StaticTrackerResult.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/StaticTrackerResult.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/StaticTrackerResult.cs index f4080823..5ab309af 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Result/StaticTrackerResult.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/StaticTrackerResult.cs @@ -2,7 +2,7 @@ using Mocassin.Mathematics.ValueTypes; using Mocassin.Model.Particles; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Stores the static tracking result of a single on a specific position id diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/TransitionMobility.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/TransitionMobility.cs similarity index 94% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/TransitionMobility.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/TransitionMobility.cs index c0457ef7..b49769c2 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Result/TransitionMobility.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Data/TransitionMobility.cs @@ -1,7 +1,7 @@ using System; using Mocassin.Model.Translator.ModelContext; -namespace Mocassin.Tools.Evaluation.Queries +namespace Mocassin.Tools.Evaluation.Queries.Data { /// /// Stores the transition resolved mobility data for a diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleDiffusionEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDiffusionEvaluation.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleDiffusionEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDiffusionEvaluation.cs index ef941fd9..b6fdb9ef 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleDiffusionEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDiffusionEvaluation.cs @@ -2,7 +2,8 @@ using System.Collections.Generic; using System.Linq; using Mocassin.Tools.Evaluation.Context; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/EnsembleDisplacementEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDisplacementEvaluation.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/EnsembleDisplacementEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDisplacementEvaluation.cs index a66521b2..95f54b55 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/EnsembleDisplacementEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleDisplacementEvaluation.cs @@ -6,6 +6,8 @@ using Mocassin.Model.Particles; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/EnsembleMetaEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMetaEvaluation.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/EnsembleMetaEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMetaEvaluation.cs index 6fc62362..15ef957e 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/EnsembleMetaEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMetaEvaluation.cs @@ -3,6 +3,7 @@ using Mocassin.Model.Particles; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleMobilityEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMobilityEvaluation.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleMobilityEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMobilityEvaluation.cs index c6216ad5..5ff9ab85 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/EnsembleMobilityEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/EnsembleMobilityEvaluation.cs @@ -2,7 +2,8 @@ using System.Collections.Generic; using System.Linq; using Mocassin.Tools.Evaluation.Context; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/GlobalTrackingEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/GlobalTrackingEvaluation.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/GlobalTrackingEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/GlobalTrackingEvaluation.cs index 763a89ee..7082e761 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/GlobalTrackingEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/GlobalTrackingEvaluation.cs @@ -2,6 +2,8 @@ using System.Collections.Generic; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/LatticeMetaEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LatticeMetaEvaluation.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/LatticeMetaEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LatticeMetaEvaluation.cs index 2b31d86c..43419bde 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Meta/Queries/LatticeMetaEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LatticeMetaEvaluation.cs @@ -3,6 +3,8 @@ using Mocassin.Mathematics.ValueTypes; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/LocalSiteCoordinationEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LocalSiteCoordinationEvaluation.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/LocalSiteCoordinationEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LocalSiteCoordinationEvaluation.cs index b385304c..28bf41c9 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/LocalSiteCoordinationEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LocalSiteCoordinationEvaluation.cs @@ -8,6 +8,7 @@ using Mocassin.Symmetry.Analysis; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/LocalSiteDensityEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LocalSiteDensityEvaluation.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/LocalSiteDensityEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/LocalSiteDensityEvaluation.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/MobileTrackingEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/MobileTrackingEvaluation.cs similarity index 94% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/MobileTrackingEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/MobileTrackingEvaluation.cs index 8cc8ced8..62e46cfb 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/MobileTrackingEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/MobileTrackingEvaluation.cs @@ -2,6 +2,8 @@ using Mocassin.Model.Particles; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/ParticleCountEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/ParticleCountEvaluation.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/ParticleCountEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/ParticleCountEvaluation.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/SiteEnvironmentEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/SiteEnvironmentEvaluation.cs similarity index 100% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Counting/Queries/SiteEnvironmentEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/SiteEnvironmentEvaluation.cs diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/SquaredDisplacementEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/SquaredDisplacementEvaluation.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/SquaredDisplacementEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/SquaredDisplacementEvaluation.cs index e118361b..c92838d7 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/SquaredDisplacementEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/SquaredDisplacementEvaluation.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using Mocassin.Mathematics.ValueTypes; using Mocassin.Tools.Evaluation.Context; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/StaticTrackingEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/StaticTrackingEvaluation.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/StaticTrackingEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/StaticTrackingEvaluation.cs index f7788954..f991f582 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Tracking/Queries/StaticTrackingEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/StaticTrackingEvaluation.cs @@ -1,6 +1,8 @@ using System.Collections.Generic; using Mocassin.Tools.Evaluation.Context; using Mocassin.Tools.Evaluation.Extensions; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/TransitionMobilityEvaluation.cs b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/TransitionMobilityEvaluation.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/TransitionMobilityEvaluation.cs rename to src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/TransitionMobilityEvaluation.cs index 1e5add43..75c1887c 100644 --- a/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/Mobility/Queries/TransitionMobilityEvaluation.cs +++ b/src/ModelBuilder/Mocassin.Tools.Evaluation/Queries/TransitionMobilityEvaluation.cs @@ -1,7 +1,8 @@ using System; using System.Collections.Generic; using Mocassin.Tools.Evaluation.Context; -using Mocassin.Tools.Evaluation.Queries.Base; +using Mocassin.Tools.Evaluation.Helper; +using Mocassin.Tools.Evaluation.Queries.Data; namespace Mocassin.Tools.Evaluation.Queries { diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Base/BinaryStructureReader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/BinaryStructureReader.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Base/BinaryStructureReader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/BinaryStructureReader.cs index b3bc301e..feb8c8bf 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Base/BinaryStructureReader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/BinaryStructureReader.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.Base +namespace Mocassin.Tools.UAccess.Readers { /// /// Provides generic read only reference access to structure contents of a byte buffer diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/Components/DynamicHistogramHeader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/DynamicHistogramHeader.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/Components/DynamicHistogramHeader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/DynamicHistogramHeader.cs index 0e37f798..6a12eb85 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/Components/DynamicHistogramHeader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/DynamicHistogramHeader.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.HistogramReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Header of a single dynamic size histogram struct of the 'C' Simulator diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsCycleCounter.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsCycleCounter.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsCycleCounter.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsCycleCounter.cs index 54a91bbf..1a5a827b 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsCycleCounter.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsCycleCounter.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation state counter collection struct that contains cycle counters of a single species of a 'C' Simulator diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsHeader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsHeader.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsHeader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsHeader.cs index 12fe42de..971318c0 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsHeader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsHeader.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation state header struct that provides build information about a 'C' Simulator state file diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpHistogram.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpHistogram.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpHistogram.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpHistogram.cs index 4afa1115..f052138f 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpHistogram.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpHistogram.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation jump histogram struct that contains the jump occurence sampling. Layout 'C' Simulator state file diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpStatistic.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpStatistic.cs similarity index 95% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpStatistic.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpStatistic.cs index 6a9d6fb8..41e1c324 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsJumpStatistic.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsJumpStatistic.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation jump histogram struct that contains energy histogram data from a 'C' Simulator state file diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMetaData.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMetaData.cs similarity index 97% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMetaData.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMetaData.cs index 04f61546..3c97bab0 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMetaData.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMetaData.cs @@ -1,6 +1,6 @@ using System.Runtime.InteropServices; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation state meta data struct that contains the meta information of a 'C' Simulator state file diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMovementTracker.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMovementTracker.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMovementTracker.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMovementTracker.cs index fb71b9c6..83daae4e 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/Components/McsMovementTracker.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/Data/McsMovementTracker.cs @@ -1,7 +1,7 @@ using System.Runtime.InteropServices; using Mocassin.Mathematics.ValueTypes; -namespace Mocassin.Tools.UAccess.Readers.McsReader.Components +namespace Mocassin.Tools.UAccess.Readers.Data { /// /// Simulation state movement tracker struct that stores a fractional movement information within the 'C' simulation diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/DynamicHistogramReader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/DynamicHistogramReader.cs similarity index 96% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/DynamicHistogramReader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/DynamicHistogramReader.cs index a9c6ee24..414c12a5 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/HistogramReader/DynamicHistogramReader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/DynamicHistogramReader.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.InteropServices; -using Mocassin.Tools.UAccess.Readers.Base; -using Mocassin.Tools.UAccess.Readers.HistogramReader.Components; +using Mocassin.Tools.UAccess.Readers.Data; namespace Mocassin.Tools.UAccess.Readers { diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/McsContentReader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsContentReader.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/McsContentReader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsContentReader.cs index ed5ff33b..aeea1421 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsReader/McsContentReader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/McsContentReader.cs @@ -1,7 +1,6 @@ using System; using System.IO; -using Mocassin.Tools.UAccess.Readers.Base; -using Mocassin.Tools.UAccess.Readers.McsReader.Components; +using Mocassin.Tools.UAccess.Readers.Data; namespace Mocassin.Tools.UAccess.Readers { diff --git a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeReader/MmcfeLogReader.cs b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeLogReader.cs similarity index 98% rename from src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeReader/MmcfeLogReader.cs rename to src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeLogReader.cs index deba50cc..9c134d86 100644 --- a/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeReader/MmcfeLogReader.cs +++ b/src/ModelBuilder/Mocassin.Tools.UAccess/Readers/MmcfeLogReader.cs @@ -1,7 +1,6 @@ using System; using System.Runtime.InteropServices; using Mocassin.Model.Translator.Routines; -using Mocassin.Tools.UAccess.Readers.Base; namespace Mocassin.Tools.UAccess.Readers {