Ensured ordering of sampling design parameters

thehoglet · thehoglet · commit 3f6cbf1f0f98 · 2020-01-09T21:26:40.000Z
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,7 @@
     <Company>HSE</Company>
     <Product>RVis</Product>
     <Copyright>Copyright © HSE 2020</Copyright>
-    <AssemblyVersion>0.9.11068.1</AssemblyVersion>
-    <FileVersion>0.9.11068.1</FileVersion>
+    <AssemblyVersion>0.9.11068.2</AssemblyVersion>
+    <FileVersion>0.9.11068.2</FileVersion>
  </PropertyGroup>
 </Project>
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-# RVis 
-[![Build Status](https://dev.azure.com/GMPtk/RVis/_apis/build/status/GMPtk.RVis?branchName=master)](https://dev.azure.com/GMPtk/RVis/_build/latest?definitionId=1&branchName=master) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+# RVis [![Build Status](https://dev.azure.com/GMPtk/RVis/_apis/build/status/GMPtk.RVis?branchName=master)](https://dev.azure.com/GMPtk/RVis/_build/latest?definitionId=1&branchName=master)
 
 ![RVis](https://repository-images.githubusercontent.com/217533905/edffd200-f72f-11e9-9750-0cdb2c75dadf "RVis")
 
diff --git a/RVis.Base/Check.cs b/RVis.Base/Check.cs
@@ -584,6 +584,20 @@ public static void RequireUniqueElements<T, U>(IEnumerable<T> enumerable, Func<T
       throw new ArgumentException(message, nameof(enumerable));
     }
 
+    [DebuggerStepThrough]
+    public static void RequireOrdered<T, U>(IEnumerable<T> enumerable, Func<T, U> keySelector) =>
+      RequireOrdered(enumerable, keySelector, $"Expecting ordered sequence of {typeof(T).Name}");
+
+    [DebuggerStepThrough]
+    public static void RequireOrdered<T, U>(IEnumerable<T> enumerable, Func<T, U> keySelector, [Localizable(false)] string message)
+    {
+      var ordered = enumerable.OrderBy(keySelector);
+      
+      if (enumerable.SequenceEqual(ordered)) return;
+
+      throw new ArgumentException(message, nameof(enumerable));
+    }
+
     #endregion
 
     #region Defaults
diff --git a/UI/Module/Sampling/Model/DistributionSampleGenerator.cs b/UI/Module/Sampling/Model/DistributionSampleGenerator.cs
@@ -34,7 +34,6 @@ private DataTable GetSamples()
 
       var parameterSamples = selectedParameters
         .Filter(ps => ps.DistributionType != DistributionType.Invariant)
-        .OrderBy(ps => ps.Name.ToUpperInvariant())
         .Select(ps => (ParameterState: ps, Samples: new double[_nSamples]))
         .ToArr();
 
diff --git a/UI/Module/Sampling/Model/Impl/RCPersist.cs b/UI/Module/Sampling/Model/Impl/RCPersist.cs
@@ -24,7 +24,7 @@ internal static RankCorrelationDesign FromDTO(this _RankCorrelationDesignDTO dto
 
       var correlations = dto.Correlations
         .Select(kvp => (Parameter: kvp.Key, Correlations: kvp.Value.ToArr()))
-        .OrderBy(t => t.Parameter)
+        .OrderBy(t => t.Parameter.ToUpperInvariant())
         .ToArr();
 
       var nCorrelations = correlations.Count;
diff --git a/UI/Module/Sampling/Model/Impl/SamplingDesign.cs b/UI/Module/Sampling/Model/Impl/SamplingDesign.cs
@@ -99,6 +99,7 @@ internal static SamplingDesign LoadSamplingDesign(string pathToSamplingDesignsDi
             Distribution.DeserializeDistribution(dp.Distribution).AssertSome()
             )
           )
+          .OrderBy(dp => dp.Name.ToUpperInvariant())
           .ToArr() ?? default;
         latinHypercubeDesign = dto.LatinHypercubeDesign.FromDTO();
         rankCorrelationDesign = dto.RankCorrelationDesign.FromDTO();
@@ -156,6 +157,7 @@ string pathToSamplingDesignDirectory
       )
     {
       RequireDirectory(pathToSamplingDesignDirectory);
+      RequireOrdered(designParameters, dp => dp.Name.ToUpperInvariant());
 
       var dto = new _SamplingDesignDTO
       {
@@ -186,6 +188,10 @@ string pathToSamplingDesignDirectory
     internal static void SaveSamples(DataTable samples, string pathToSamplingDesignDirectory)
     {
       RequireDirectory(pathToSamplingDesignDirectory);
+      RequireOrdered(
+        samples.Columns.Cast<DataColumn>(), 
+        dc => dc.ColumnName.ToUpperInvariant()
+        );
 
       var pathToDesignSamples = Combine(pathToSamplingDesignDirectory, DESIGN_SAMPLES_FILE_NAME);
 
diff --git a/UI/Module/Sampling/Model/ModelExt.cs b/UI/Module/Sampling/Model/ModelExt.cs
@@ -59,7 +59,7 @@ internal static bool IsValidCorrelations(
     {
       var parameters = correlations.Map(c => c.Parameter);
 
-      var isInAscendingOrder = parameters.SequenceEqual(parameters.OrderBy(n => n));
+      var isInAscendingOrder = parameters.SequenceEqual(parameters.OrderBy(n => n.ToUpperInvariant()));
       if (!isInAscendingOrder) return false;
 
       var hasExpectedArrayLengths = correlations
@@ -141,7 +141,7 @@ string parameter
       RequireFalse(correlations.Exists(c => c.Parameter == parameter));
 
       var parameters = correlations.Map(c => c.Parameter) + parameter;
-      parameters = parameters.OrderBy(n => n).ToArr();
+      parameters = parameters.OrderBy(n => n.ToUpperInvariant()).ToArr();
 
       var nParameters = parameters.Count;
       var indexInserted = parameters.IndexOf(parameter);
diff --git a/UI/Module/Sampling/Model/SampleGeneratorBase.cs b/UI/Module/Sampling/Model/SampleGeneratorBase.cs
@@ -24,6 +24,8 @@ internal SampleGeneratorBase(
       IRVisServerPool serverPool
       )
     {
+      RequireOrdered(parameterStates, ps => ps.Name.ToUpperInvariant());
+
       _parameterStates = parameterStates;
       _rankCorrelationDesign = rankCorrelationDesign;
       _nSamples = nSamples;
diff --git a/UI/Module/Sampling/State/Impl/ModuleState.cs b/UI/Module/Sampling/State/Impl/ModuleState.cs
@@ -85,6 +85,7 @@ internal static void Save(ModuleState instance, Simulation simulation)
             DistributionStates = Distribution.SerializeDistributions(ps.Distributions),
             IsSelected = ps.IsSelected
           })
+          .OrderBy(ps => ps.Name.ToUpperInvariant())
           .ToArray(),
 
           SamplingDesign = instance.SamplingDesign?.CreatedOn.ToDirectoryName(),
diff --git a/UI/Module/Sampling/ViewModel.cs b/UI/Module/Sampling/ViewModel.cs
@@ -563,7 +563,10 @@ private void LoadSamplingDesign(DateTime createdOn)
             return parameterState;
           });
 
-        _moduleState.ParameterStates = existingParameterStates + newParameterStates;
+        var parameterStates = existingParameterStates + newParameterStates;
+        _moduleState.ParameterStates = parameterStates
+          .OrderBy(ps => ps.Name.ToUpperInvariant())
+          .ToArr();
 
         UnloadDesign();
 
diff --git a/UI/Module/Sampling/ViewModels/DesignViewModel.cs b/UI/Module/Sampling/ViewModels/DesignViewModel.cs
@@ -174,10 +174,10 @@ private void HandleCreateDesign()
     {
       RequireTrue(CreatedOn.HasValue);
       RequireFalse(_moduleState.Samples == default);
+      RequireOrdered(_moduleState.ParameterStates, ps => ps.Name.ToUpperInvariant());
 
       var parameterDistributions = _moduleState.ParameterStates
         .Filter(ps => ps.IsSelected)
-        .OrderBy(ps => ps.Name.ToUpperInvariant())
         .Select(ps => (ps.Name, Distribution: ps.GetDistribution()))
         .ToArr();
 
diff --git a/UI/Module/Sampling/ViewModels/ParametersViewModel.cs b/UI/Module/Sampling/ViewModels/ParametersViewModel.cs
@@ -37,8 +37,8 @@ internal ParametersViewModel(IAppState appState, IAppService appService, IAppSet
       moduleState.ParameterStates.Iter(ps =>
       {
         var parameterViewModel = AllParameterViewModels
-        .Find(vm => vm.Name == ps.Name)
-        .AssertSome($"Unknown parameter in module state: {ps.Name}");
+          .Find(vm => vm.Name == ps.Name)
+          .AssertSome($"Unknown parameter in module state: {ps.Name}");
 
         parameterViewModel.IsSelected = ps.IsSelected;
       });
@@ -131,7 +131,10 @@ private void HandleToggleSelectParameter(IParameterViewModel parameterViewModel)
           var parameters = _simulation.SimConfig.SimInput.SimParameters;
           var parameter = parameters.GetParameter(parameterViewModel.Name);
           parameterState = ParameterState.Create(parameter.Name, parameter.Scalar);
-          _moduleState.ParameterStates += parameterState;
+          var parameterStates = _moduleState.ParameterStates + parameterState;
+          _moduleState.ParameterStates = parameterStates
+            .OrderBy(ps => ps.Name.ToUpperInvariant())
+            .ToArr();
         }
 
         if (isSelected)
diff --git a/UI/Module/Sampling/ViewModels/SamplesViewModel.cs b/UI/Module/Sampling/ViewModels/SamplesViewModel.cs
@@ -266,12 +266,13 @@ private void HandleConfigureLHS()
 
     private void HandleConfigureRC()
     {
+      RequireOrdered(_moduleState.ParameterStates, ps => ps.Name.ToUpperInvariant());
+
       var view = new RCConfigurationDialog();
 
       var selectedParameters = _moduleState.ParameterStates
         .Filter(ps => ps.IsSelected && ps.DistributionType != DistributionType.Invariant)
         .Map(ps => ps.Name)
-        .OrderBy(n => n)
         .ToArr();
 
       var correlations = _moduleState.SamplesState.RankCorrelationDesign.Correlations.CorrelationsFor(
@@ -311,6 +312,7 @@ private async Task HandleGenerateSamplesAsync()
     {
       RequireTrue(NSamples > 0);
       RequireTrue(_moduleState.ParameterStates.Exists(ps => ps.IsSelected));
+      RequireOrdered(_moduleState.ParameterStates, ps => ps.Name.ToUpperInvariant());
 
       if (_moduleState.SamplesState.RankCorrelationDesign.RankCorrelationDesignType != RankCorrelationDesignType.None)
       {
@@ -502,14 +504,12 @@ private void PopulateDistributions(Arr<ParameterState> parameterStates) =>
         .Filter(ps => ps.IsSelected)
         .Map(ps => (ps.Name, Distribution: ps.GetDistribution()))
         .Filter(t => t.Distribution.DistributionType != DistributionType.Invariant)
-        .OrderBy(t => t.Name.ToUpperInvariant())
         .Select(t => t.Distribution.ToString(t.Name))
         .ToArr();
 
     private void PopulateDistributions(Arr<DesignParameter> designParameters) =>
       Distributions = designParameters
         .Filter(dp => dp.Distribution.DistributionType != DistributionType.Invariant)
-        .OrderBy(dp => dp.Name.ToUpperInvariant())
         .Select(dp => dp.Distribution.ToString(dp.Name))
         .ToArr();
 
@@ -518,14 +518,12 @@ private void PopulateInvariants(Arr<ParameterState> parameterStates) =>
         .Filter(ps => ps.IsSelected)
         .Map(ps => (ps.Name, Distribution: ps.GetDistribution()))
         .Filter(t => t.Distribution.DistributionType == DistributionType.Invariant)
-        .OrderBy(t => t.Name.ToUpperInvariant())
         .Select(t => t.Distribution.ToString(t.Name))
         .ToArr();
 
     private void PopulateInvariants(Arr<DesignParameter> designParameters) =>
       Invariants = designParameters
         .Filter(dp => dp.Distribution.DistributionType == DistributionType.Invariant)
-        .OrderBy(dp => dp.Name.ToUpperInvariant())
         .Select(dp => dp.Distribution.ToString(dp.Name))
         .ToArr();
 
diff --git a/UI/RVisUI/App.xaml b/UI/RVisUI/App.xaml
@@ -27,6 +27,9 @@
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Indigo.xaml" />
         <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Indigo.xaml" />
 
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Fonts.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.MahApps;component/Themes/MaterialDesignTheme.MahApps.Flyout.xaml" />
+
         <ResourceDictionary Source="pack://application:,,,/RVisUI.AppInf;component/Resources/HelpButton.xaml"/>
 
       </ResourceDictionary.MergedDictionaries>
diff --git a/UI/RVisUI/AppImpl/App.Window.cs b/UI/RVisUI/AppImpl/App.Window.cs
@@ -1,12 +1,12 @@
 ﻿using RVisUI.Interop;
 using System.Linq;
-using System.Windows.Interop;
+using System.Windows;
 
 namespace RVisUI
 {
   public partial class App
   {
-    public void RunDialog<T>(object viewModel = null) where T : System.Windows.Window, new()
+    public void RunDialog<T>(object viewModel = null) where T : Window, new()
     {
       var dialog = new T();
       if (null != viewModel)
@@ -17,12 +17,14 @@ public partial class App
       dialog.ShowDialog();
     }
 
-    public System.Windows.Window GetActiveWindow()
+    public Window GetActiveWindow()
     {
       var window = SafeNativeMethods.GetActiveApplicationWindow();
       if (null == window)
       {
-        window = this.Windows.OfType<System.Windows.Window>().SingleOrDefault(x => x.IsActive);
+        window = Windows
+          .OfType<Window>()
+          .SingleOrDefault(x => x.IsActive);
       }
       return window;
     }
diff --git a/UI/RVisUI/DepProps/Content/Content.cs b/UI/RVisUI/DepProps/Content/Content.cs
@@ -39,7 +39,6 @@ private static void HandleUIComponentsChanged(DependencyObject d, DependencyProp
 
       if (!e.NewValue.Resolve(out Arr<(string ID, string DisplayName, string DisplayIcon, object View, object ViewModel)> newUIComponents)) return;
 
-      var selectedID = (tabControl.SelectedItem as TabItem)?.Tag as string;
       tabControl.Items.Clear();
 
       var tabItems = newUIComponents.Map(c =>
diff --git a/UI/RVisUI/Extensions/SettingsExt.cs b/UI/RVisUI/Extensions/SettingsExt.cs
@@ -3,70 +3,13 @@
 using MaterialDesignThemes.Wpf;
 using RVis.Base.Extensions;
 using RVisUI.Properties;
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Media;
 
 namespace RVisUI.Extensions
 {
-  internal static class ThemeExt
+  internal static class SettingsExt
   {
-    internal static void ChangeBaseTheme(this PaletteHelper paletteHelper, bool isDark)
-    {
-      var theme = paletteHelper.GetTheme();
-      var baseTheme = isDark ? new MaterialDesignDarkTheme() : (IBaseTheme)new MaterialDesignLightTheme();
-      theme.SetBaseTheme(baseTheme);
-      paletteHelper.SetTheme(theme);
-    }
-
-    public static void ChangePrimaryColor(this PaletteHelper paletteHelper, Color color)
-    {
-      var theme = paletteHelper.GetTheme();
-
-      theme.PrimaryLight = new ColorPair(color.Lighten(), theme.PrimaryLight.ForegroundColor);
-      theme.PrimaryMid = new ColorPair(color, theme.PrimaryMid.ForegroundColor);
-      theme.PrimaryDark = new ColorPair(color.Darken(), theme.PrimaryDark.ForegroundColor);
-
-      paletteHelper.SetTheme(theme);
-    }
-
-    public static void ChangePrimaryForegroundColor(this PaletteHelper paletteHelper, Color? color)
-    {
-      var theme = paletteHelper.GetTheme();
-
-      theme.PrimaryLight = new ColorPair(theme.PrimaryLight.Color, color?.Lighten());
-      theme.PrimaryMid = new ColorPair(theme.PrimaryMid.Color, color);
-      theme.PrimaryDark = new ColorPair(theme.PrimaryDark.Color, color?.Darken());
-
-      paletteHelper.SetTheme(theme);
-    }
-
-    public static void ChangeSecondaryColor(this PaletteHelper paletteHelper, Color color)
-    {
-      var theme = paletteHelper.GetTheme();
-
-      theme.SecondaryLight = new ColorPair(color.Lighten(), theme.SecondaryLight.ForegroundColor);
-      theme.SecondaryMid = new ColorPair(color, theme.SecondaryMid.ForegroundColor);
-      theme.SecondaryDark = new ColorPair(color.Darken(), theme.SecondaryDark.ForegroundColor);
-
-      paletteHelper.SetTheme(theme);
-    }
-
-    public static void ChangeSecondaryForegroundColor(this PaletteHelper paletteHelper, Color? color)
-    {
-      var theme = paletteHelper.GetTheme();
-
-      theme.SecondaryLight = new ColorPair(theme.SecondaryLight.Color, color?.Lighten());
-      theme.SecondaryMid = new ColorPair(theme.SecondaryMid.Color, color);
-      theme.SecondaryDark = new ColorPair(theme.SecondaryDark.Color, color?.Darken());
-
-      paletteHelper.SetTheme(theme);
-    }
-
-    internal static void ApplyTheme(this Settings settings) => 
+    internal static void ApplyTheme(this Settings settings) =>
       ApplyTheme(
         settings.IsBaseDark,
         settings.PrimaryColorName,
@@ -80,8 +23,8 @@ internal static void ApplyTheme(this Settings settings) =>
         );
 
     internal static void ApplyTheme(
-      bool isBaseDark, 
-      string primaryColorName, 
+      bool isBaseDark,
+      string primaryColorName,
       int primaryColorHue,
       string secondaryColorName,
       int secondaryColorHue,
diff --git a/UI/RVisUI/Extensions/ThemeExt.cs b/UI/RVisUI/Extensions/ThemeExt.cs
diff --git a/UI/RVisUI/Interop/SafeNativeMethods.cs b/UI/RVisUI/Interop/SafeNativeMethods.cs
diff --git a/UI/RVisUI/Ioc/AppService.cs b/UI/RVisUI/Ioc/AppService.cs
diff --git a/UI/RVisUI/RVisUI.csproj b/UI/RVisUI/RVisUI.csproj
diff --git a/Version/VersionInfo.cs b/Version/VersionInfo.cs
diff --git a/release_notes.md b/release_notes.md

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,7 @@ internal static SamplingDesign LoadSamplingDesign(string pathToSamplingDesignsDi`
`99`	`99`	`Distribution.DeserializeDistribution(dp.Distribution).AssertSome()`
`100`	`100`	`)`
`101`	`101`	`)`
	`102`	`+ .OrderBy(dp => dp.Name.ToUpperInvariant())`
`102`	`103`	`.ToArr() ?? default;`
`103`	`104`	`latinHypercubeDesign = dto.LatinHypercubeDesign.FromDTO();`
`104`	`105`	`rankCorrelationDesign = dto.RankCorrelationDesign.FromDTO();`
`@@ -156,6 +157,7 @@ string pathToSamplingDesignDirectory`
`156`	`157`	`)`
`157`	`158`	`{`
`158`	`159`	`RequireDirectory(pathToSamplingDesignDirectory);`
	`160`	`+ RequireOrdered(designParameters, dp => dp.Name.ToUpperInvariant());`
`159`	`161`
`160`	`162`	`var dto = new _SamplingDesignDTO`
`161`	`163`	`{`
`@@ -186,6 +188,10 @@ string pathToSamplingDesignDirectory`
`186`	`188`	`internal static void SaveSamples(DataTable samples, string pathToSamplingDesignDirectory)`
`187`	`189`	`{`
`188`	`190`	`RequireDirectory(pathToSamplingDesignDirectory);`
	`191`	`+ RequireOrdered(`
	`192`	`+ samples.Columns.Cast<DataColumn>(),`
	`193`	`+ dc => dc.ColumnName.ToUpperInvariant()`
	`194`	`+ );`
`189`	`195`
`190`	`196`	`var pathToDesignSamples = Combine(pathToSamplingDesignDirectory, DESIGN_SAMPLES_FILE_NAME);`
`191`	`197`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ internal SampleGeneratorBase(`
`24`	`24`	`IRVisServerPool serverPool`
`25`	`25`	`)`
`26`	`26`	`{`
	`27`	`+ RequireOrdered(parameterStates, ps => ps.Name.ToUpperInvariant());`
	`28`	`+`
`27`	`29`	`_parameterStates = parameterStates;`
`28`	`30`	`_rankCorrelationDesign = rankCorrelationDesign;`
`29`	`31`	`_nSamples = nSamples;`