fixed bad file name generation

FZJ-IEK3-VSA · Jun 4, 2020 · a18ee70 · a18ee70
1 parent f367ec7
commit a18ee70
Show file tree

Hide file tree

Showing 41 changed files with 492 additions and 64 deletions.
diff --git a/Automation/Automation.csproj b/Automation/Automation.csproj
@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Automation/HouseholdData.cs b/Automation/HouseholdData.cs
@@ -88,7 +88,7 @@ public HouseholdData([NotNull] string uniqueHouseholdId,
             TransportationDeviceSet = transportationDeviceSet;
             TravelRouteSet = travelRouteSet;
             TransportationDistanceModifiers = transportationDistanceModifiers;
-            HouseholdDataSpecifictionType = householdDataSpecifictionType;
+            HouseholdDataSpecificationType = householdDataSpecifictionType;
         }
 
         [Obsolete("For json only")]
@@ -124,6 +124,6 @@ public HouseholdData()
         [ItemNotNull]
         public List<TransportationDistanceModifier>? TransportationDistanceModifiers { get; set; }
         [JsonConverter(typeof(StringEnumConverter))]
-        public HouseholdDataSpecificationType HouseholdDataSpecifictionType { get; set; }
+        public HouseholdDataSpecificationType HouseholdDataSpecificationType { get; set; }
     }
 }
diff --git a/Automation/JsonSumProfile.cs b/Automation/JsonSumProfile.cs
@@ -29,7 +29,9 @@ public JsonDeviceProfiles(TimeSpan timeResolution, DateTime startTime, string lo
             LoadTypeInformation = loadTypeInformation;
         }
         [Obsolete("only for json")]
+#pragma warning disable 8618
         public JsonDeviceProfiles()
+#pragma warning restore 8618
         {
         }
 
@@ -54,7 +56,9 @@ public JsonSumProfile(string name, TimeSpan timeResolution, DateTime startTime,
             LoadTypeInformation = loadTypeInformation;
         }
         [Obsolete("only for json")]
+#pragma warning disable 8618
         public JsonSumProfile()
+#pragma warning restore 8618
         {
         }
 

diff --git a/Automation/LoadTypePriority.cs b/Automation/LoadTypePriority.cs
@@ -5,7 +5,7 @@ public enum LoadTypePriority
         Mandatory,
         RecommendedForHouseholds,
         RecommendedForHouses,
-        Optional,
+        OptionalLoadtypes,
         All
     }
 }
diff --git a/Automation/StrGuid.cs b/Automation/StrGuid.cs
@@ -2,7 +2,7 @@
 
 namespace Automation
 {
-    public struct StrGuid : IEquatable<StrGuid>, IComparable<StrGuid> {
+    public struct StrGuid : IEquatable<StrGuid>, IComparable<StrGuid>, IComparable {
         public int CompareTo(StrGuid? other)
         {
             if (!other.HasValue) {
@@ -21,6 +21,23 @@ public bool Equals(StrGuid? other)
             return StrVal == other.Value.StrVal;
         }
 
+        public int CompareTo(object? obj)
+        {
+            if (ReferenceEquals(null, obj)) {
+                return 1;
+            }
+
+            return obj is StrGuid other ? CompareTo(other) : throw new ArgumentException($"Object must be of type {nameof(StrGuid)}");
+        }
+
+        public static bool operator <(StrGuid left, StrGuid right) => left.CompareTo(right) < 0;
+
+        public static bool operator >(StrGuid left, StrGuid right) => left.CompareTo(right) > 0;
+
+        public static bool operator <=(StrGuid left, StrGuid right) => left.CompareTo(right) <= 0;
+
+        public static bool operator >=(StrGuid left, StrGuid right) => left.CompareTo(right) >= 0;
+
         public bool Equals(StrGuid other)
         {
             return StrVal == other.StrVal;

diff --git a/CalcPostProcessor/CalcPostProcessor.csproj b/CalcPostProcessor/CalcPostProcessor.csproj
@@ -15,6 +15,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="5.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdDeviceProfileProcessor.cs b/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdDeviceProfileProcessor.cs
@@ -41,9 +41,8 @@ protected override void PerformActualStep(IStepParameters parameters)
             var columns = efc.ColumnEntriesByColumn[p.LoadType].Values.Where(entry => entry.HouseholdKey == key).Select(entry => entry.Column)
                 .ToList();
             var hhname = "." + key + ".";
-            StreamWriter normalfile = null;
 
-            normalfile = _fft.MakeFile<StreamWriter>("DeviceProfiles" + hhname + p.LoadType.Name + ".csv",
+            var normalfile = _fft.MakeFile<StreamWriter>("DeviceProfiles" + hhname + p.LoadType.Name + ".csv",
                 "Energy use by each device in each Timestep for " + p.LoadType.Name + " for " + hhname,
                 true,
                 ResultFileID.DeviceProfileForHouseholds,
@@ -62,11 +61,6 @@ protected override void PerformActualStep(IStepParameters parameters)
 
                 var time = dsc.MakeTimeString(efr.Timestep);
                 var indidivdual = time + efr.GetEnergyEntriesAsString(true, p.LoadType, columns, Repository.CalcParameters.CSVCharacter);
-                if (normalfile == null)
-                {
-                    throw new LPGException("File is null, even though it shouldn't be. Please report.");
-                }
-
                 normalfile.WriteLine(indidivdual);
 
             }

diff --git a/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdJsonSumProfileProcessor.cs b/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdJsonSumProfileProcessor.cs
@@ -44,7 +44,7 @@ protected override void PerformActualStep(IStepParameters parameters)
                 .Where(entry => entry.HouseholdKey == p.Key.HouseholdKey)
                 .Select(entry => entry.Column)
                 .ToList();
-            var hhname = "." + p.Key.HouseholdKey + ".";
+            var hhname = "." + p.Key.HouseholdKey ;
             var calcParameters = Repository.CalcParameters;
             var jrf = new JsonSumProfile("Sum profile", calcParameters.InternalStepsize,
                 calcParameters.OfficialStartTime, dstLoadType.Name, dstLoadType.UnitOfSum, dstLoadType.ConvertToLoadTypeInformation());

diff --git a/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdSumProfileProcessor.cs b/CalcPostProcessor/LoadTypeHouseholdSteps/IndividualHouseholdSumProfileProcessor.cs
@@ -51,7 +51,7 @@ protected override void PerformActualStep(IStepParameters parameters)
                 ResultFileID.SumProfileForHouseholds,
                 p.Key.HouseholdKey,
                 TargetDirectory.Results,
-                Repository.CalcParameters.InternalStepsize, CalcOption.HouseSumProfilesFromDetailedDats,
+                Repository.CalcParameters.InternalStepsize, CalcOption.HouseholdSumProfilesFromDetailedDats,
                 dstLoadType.ConvertToLoadTypeInformation());
             sumfile.WriteLine(dstLoadType.Name + "." + dsc.GenerateDateStampHeader() + "Sum [" + dstLoadType.UnitOfSum +
                               "]");

diff --git a/CalcPostProcessor/LoadTypeProcessingSteps/HouseDeviceProfileFileProcessor.cs b/CalcPostProcessor/LoadTypeProcessingSteps/HouseDeviceProfileFileProcessor.cs
@@ -35,7 +35,7 @@
 using Common.SQLResultLogging;
 using JetBrains.Annotations;
 
-namespace CalcPostProcessor.LoadTypeHouseholdSteps {
+namespace CalcPostProcessor.LoadTypeProcessingSteps {
     public class HouseDeviceProfileFileProcessor: LoadTypeStepBase
     {
         [NotNull]

diff --git a/CalcPostProcessor/LoadTypeProcessingSteps/HouseSumProfilesFromDetailedDatsProcessor.cs b/CalcPostProcessor/LoadTypeProcessingSteps/HouseSumProfilesFromDetailedDatsProcessor.cs
@@ -8,7 +8,7 @@
 using Common.SQLResultLogging;
 using JetBrains.Annotations;
 
-namespace CalcPostProcessor.LoadTypeHouseholdSteps {
+namespace CalcPostProcessor.LoadTypeProcessingSteps {
     public class HouseSumProfilesFromDetailedDatsProcessor : LoadTypeStepBase
     {
         [NotNull]

diff --git a/CalcPostProcessorTests/CalcPostProcessorTests.csproj b/CalcPostProcessorTests/CalcPostProcessorTests.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CalcPostProcessorTests/PostProcessingManagerTests.cs b/CalcPostProcessorTests/PostProcessingManagerTests.cs
@@ -36,7 +36,7 @@ public void Run()
                         EnergyIntensityType.EnergySaving,
                         false,
                         null,
-                        LoadTypePriority.Optional,
+                        LoadTypePriority.OptionalLoadtypes,
                         null,
                         null,
                         null,

diff --git a/Calculation.Tests/Calculation.Tests.csproj b/Calculation.Tests/Calculation.Tests.csproj
@@ -18,6 +18,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Calculation.Tests/HouseholdElements/CalcHouseholdTests.cs b/Calculation.Tests/HouseholdElements/CalcHouseholdTests.cs
@@ -35,10 +35,11 @@ public CalcHouseholdTests([NotNull] ITestOutputHelper testOutputHelper) : base(t
         [Trait(UnitTestCategories.Category,UnitTestCategories.BasicTest)]
         public void DumpHouseholdContentsToTextTest()
         {
-            using (var wd1 = new WorkingDir(Utili.GetCurrentMethodAndClass()))
+            using (var db = new DatabaseSetup(Utili.GetCurrentMethodAndClass()))
             {
-                using (var db = new DatabaseSetup(Utili.GetCurrentMethodAndClass()))
-                {
+                using (var wd1 = new WorkingDir(Utili.GetCurrentMethodAndClass()))
+            {
+
                     var sim = new Simulator(db.ConnectionString)
                     {
                         MyGeneralConfig = {
@@ -78,9 +79,11 @@ public void DumpHouseholdContentsToTextTest()
                     CalcManager.ExitCalcFunction = true;
                     cm.CalcObject.DumpHouseholdContentsToText();
                     cm.Dispose();
+
                     db.Cleanup();
+                    wd1.CleanUp();
                 }
-                wd1.CleanUp();
+
             }
         }
     }

diff --git a/CalculationController.Tests/CalculationController.Tests.csproj b/CalculationController.Tests/CalculationController.Tests.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CalculationController/CalculationController.csproj b/CalculationController/CalculationController.csproj
@@ -16,6 +16,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="5.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CalculationEngine/CalculationEngine.csproj b/CalculationEngine/CalculationEngine.csproj
@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CalculationEngine/HouseholdElements/CalcHousehold.cs b/CalculationEngine/HouseholdElements/CalcHousehold.cs
@@ -210,7 +210,7 @@ public void DumpHouseholdContentsToText()
             }
 
             using (var sw = _calcRepo.FileFactoryAndTracker.MakeFile<StreamWriter>(
-                "HouseholdContents." + _householdKey + "."  + ".txt",
+                "HouseholdContents." + _householdKey + ".txt",
                 "List of persons, locations, devices and affordances in this household", true, ResultFileID.HouseholdContentsDump,
                 _householdKey, TargetDirectory.Root,  _calcRepo.CalcParameters.InternalStepsize, CalcOption.HouseholdContents)) {
                 sw.WriteLine("Name:" + _name);
@@ -628,7 +628,7 @@ private void DumpTimeProfiles()
             }
 
             var swTime = _calcRepo.FileFactoryAndTracker.MakeFile<StreamWriter>(
-                "TimeProfiles." + _householdKey + "."  + ".txt",
+                "TimeProfiles." + _householdKey +  ".txt",
                 "List of time profiles used in this household", true, ResultFileID.DumpTime, _householdKey,
                 TargetDirectory.Debugging, _calcRepo.CalcParameters.InternalStepsize, CalcOption.TimeProfileFile);
             var c = _calcRepo.CalcParameters.CSVCharacter;

diff --git a/ChartCreator2.Tests/ChartCreator2.Tests.csproj b/ChartCreator2.Tests/ChartCreator2.Tests.csproj
@@ -14,6 +14,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/ChartCreator2/ChartCreator2.csproj b/ChartCreator2/ChartCreator2.csproj
@@ -17,6 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="5.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/ChartPDFCreator/ChartPDFCreator.csproj b/ChartPDFCreator/ChartPDFCreator.csproj
@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Common.Tests/Common.Tests.csproj b/Common.Tests/Common.Tests.csproj
@@ -15,6 +15,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Common/Enums/LoadTypePriority.cs b/Common/Enums/LoadTypePriority.cs
@@ -10,7 +10,7 @@ public static class LoadTypePriorityHelper {
                 {LoadTypePriority.Mandatory, "Mandatory"},
                 {LoadTypePriority.RecommendedForHouseholds, "Recommended for households"},
                 {LoadTypePriority.RecommendedForHouses, "Recommended for households and houses"},
-                {LoadTypePriority.Optional, "Optional"},
+                {LoadTypePriority.OptionalLoadtypes, "Optional"},
                 {LoadTypePriority.All, "All"}
             };
 
@@ -20,7 +20,7 @@ public static class LoadTypePriorityHelper {
                 {LoadTypePriority.Mandatory, "Mandatory"},
                 {LoadTypePriority.RecommendedForHouseholds, "Recommended for households"},
                 {LoadTypePriority.RecommendedForHouses, "Recommended for households and houses"},
-                {LoadTypePriority.Optional, "Optional"}
+                {LoadTypePriority.OptionalLoadtypes, "Optional"}
             };
     }
 }
diff --git a/Database.Tests/Database.Tests.csproj b/Database.Tests/Database.Tests.csproj
@@ -14,6 +14,7 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Database.Tests/DatabaseSetup.cs b/Database.Tests/DatabaseSetup.cs
@@ -39,7 +39,6 @@
 using Automation.ResultFiles;
 using Common;
 using Database.Database;
-using Database.Helpers;
 using Database.Tables;
 using Database.Tables.BasicElements;
 using Database.Tables.BasicHouseholds;
@@ -123,7 +122,7 @@ public DatabaseSetup([JetBrains.Annotations.NotNull] string testname,
             Logger.Info("Working with " + FileName + " copied from " + SourcePath);
             Config.IsInUnitTesting = true;
             ConnectionString = "Data Source=" + FileName;
-            DatabaseVersionChecker.CheckVersion(ConnectionString);
+            //DatabaseVersionChecker.CheckVersion(ConnectionString);
         }
 
         public string SourcePath { get; set; }

diff --git a/Database/Database.csproj b/Database/Database.csproj
@@ -14,6 +14,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/IntegrationTests/IntegrationTests.csproj b/IntegrationTests/IntegrationTests.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/LoadProfileGenerator.Tests/LoadProfileGenerator.Tests.csproj b/LoadProfileGenerator.Tests/LoadProfileGenerator.Tests.csproj
@@ -13,6 +13,7 @@
   <ItemGroup>
     <PackageReference Include="FluentAssertions.Analyzers" Version="0.11.4" />
     <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis" Version="3.6.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ public void Run() @@
                             EnergyIntensityType.EnergySaving,
                             false,
                             null,
-                            LoadTypePriority.Optional,
+                            LoadTypePriority.OptionalLoadtypes,
                             null,
                             null,
                             null,
@@ Expand Down @@