Feature/support net7 windows build

.vscode/launch.json

@@ -5,7 +5,7 @@
       "name": "Rhino8 - netcore",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "build",
+      "preLaunchTask": "build-net7.0",
       "program": "C:/Program Files/Rhino 8/System/Rhino.exe",
       "targetArchitecture": "x86_64",
       "args": "/netcore /nosplash /runscript=\"_Grasshopper\"",
@@ -25,7 +25,7 @@
       "targetArchitecture": "x86_64",
       "args": "/netfx /nosplash /runscript=\"_Grasshopper\"",
       "env": {
-        "RHINO_PACKAGE_DIRS": "${workspaceFolder}/bin/Debug"
+        "RHINO_PACKAGE_DIRS": "${workspaceFolder}/bin"
       },
       "cwd": "${workspaceFolder}",
       "console": "internalConsole",
@@ -38,6 +38,9 @@
       "preLaunchTask": "build",
       "program": "C:/Program Files/Rhino 7/System/Rhino.exe",
       "args": "/nosplash /runscript=\"_Grasshopper\"",
+      "env": {
+        "RHINO_PACKAGE_DIRS": "${workspaceFolder}/bin"
+      },
       "cwd": "${workspaceFolder}",
       "console": "internalConsole",
       "stopAtEntry": true

.vscode/tasks.json

@@ -16,6 +16,23 @@
                 "clear": true
             },
             "group": "build",
+        },
+        {
+            "label": "build-net7.0",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "/p:TargetFramework=net7.0-windows",
+                "/clp:NoSummary",
+                "${workspaceFolder}/Tunny/Tunny.csproj"
+            ],
+            "problemMatcher": "$msCompile",
+            "presentation": {
+                "reveal": "always",
+                "clear": true
+            },
+            "group": "build",
         }
     ]
 }

CHANGELOG.md

@@ -18,10 +18,12 @@ Please see [here](https://github.com/hrntsm/Tunny/releases) for the data release
 - Variables can now be set to log scale from the UI.
 - Checkbox which minimize Rhino Window when start optimization
 - Support some optunahub sampler.
-  - Auto sampler, MOEA/D sampler, MO-CMA-ES sampler
+  - Auto sampler, MOEA/D sampler, MO-CMA-ES sampler, DifferentialEvolution sampler
 - ConstructFishEggByCsv component
   - Make it easy to set FishEgg to use csv.
 - Other Grasshopper component compatibility check.
+- Support net7.0-windows build
+  - For Rhino8
 
 ### Changed
 

Optuna/Dashboard/HumanInTheLoop/HumanSliderInput.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 
@@ -75,7 +76,8 @@
                 string path = $"{_tmpPath}/image_{study.Id}_{trial.Id}.png";
                 bitmap?.Save(path, System.Drawing.Imaging.ImageFormat.Png);
                 dynamic artifactId = uploadArtifact(_artifactBackend, trial.PyInstance, path);
-                noteText.AppendLine($"![](/artifacts/{study.Id}/{trial.Id}/{artifactId})");
+                string str = $"![](/artifacts/{study.Id}/{trial.Id}/{artifactId})";
+                noteText.AppendLine(str);
             }
 
             dynamic textWrap = _importedLibrary.Get("textwrap");

Optuna/Optuna.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net48; net7.0-windows</TargetFrameworks>
+    <NoWarn>NU1701;NETSDK1086</NoWarn>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
-    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>
@@ -44,6 +44,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
     <PackageReference Include="Stub.System.Data.SQLite.Core.NetFramework" Version="1.0.119" />
+    <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
   </ItemGroup>
 
 </Project>

Optuna/Sampler/OptunaHub/DESampler.cs

@@ -0,0 +1,37 @@
+using Python.Runtime;
+
+namespace Optuna.Sampler.OptunaHub
+{
+    /// <summary>
+    /// https://hub.optuna.org/samplers/differential_evolution/
+    /// </summary>
+    public class DESampler : HubSamplerBase
+    {
+        private const string Package = "samplers/differential_evolution";
+        public double DEFactor { get; set; } = 0.8;
+        public double CrossOverRate { get; set; } = 0.7;
+        public int? PopulationSize { get; set; }
+
+        public dynamic ToPython()
+        {
+            dynamic optunahub = Py.Import("optunahub");
+            dynamic module = optunahub.load_module(package: Package, force_reload: ForceReload);
+            PyObject popSize;
+            if (PopulationSize == null || PopulationSize.Value <= 0)
+            {
+                popSize = new PyString("auto");
+            }
+            else
+            {
+                popSize = new PyInt(PopulationSize.Value);
+            }
+            return module.DESampler(
+                seed: Seed,
+                population_size: popSize,
+                F: DEFactor,
+                CR: CrossOverRate,
+                debug: false
+            );
+        }
+    }
+}

Optuna/Storage/IOptunaStorage.cs

@@ -28,7 +28,7 @@ public interface IOptunaStorage
         int GetTrialNumberFromId(int trialId);
         double GetTrialParam(int trialId, string paramName);
         bool SetTrialStateValue(int trialId, TrialState state, double[] values = null);
-        void SetTrialIntermediateValue(int trialId, int step, double intermediateValue);
+        void SetTrialIntermediateValue(int trialId, int intermediateStep, double intermediateValue);
         void SetTrialUserAttr(int trialId, string key, object value);
         void SetTrialSystemAttr(int trialId, string key, object value);
 

Optuna/Storage/Journal/Storage.cs

@@ -366,7 +366,7 @@ public void SetTrailParam(int trialId, string paramName, double paramValueIntern
             GetTrial(trialId).Params[paramName] = paramValueInternal;
         }
 
-        public void SetTrialIntermediateValue(int trialId, int step, double intermediateValue)
+        public void SetTrialIntermediateValue(int trialId, int intermediateStep, double intermediateValue)
         {
             throw new NotImplementedException();
         }

Optuna/Storage/RDB/Storage.cs

@@ -306,7 +306,7 @@
             throw new NotImplementedException();
         }
 
-        public void SetTrialIntermediateValue(int trialId, int step, double intermediateValue)
+        public void SetTrialIntermediateValue(int trialId, int intermediateStep, double intermediateValue)
         {
             throw new NotImplementedException();
         }
@@ -356,7 +356,7 @@
                         {
                             while (reader.Read())
                             {
                                 directions.Add((StudyDirection)Enum.Parse(typeof(StudyDirection), reader.GetString(0), true));
                             }
                         }
                     }
@@ -446,7 +446,7 @@
                             {
                                 TrialId = trialId,
                                 Number = reader.GetInt32(0),
                                 State = (TrialState)Enum.Parse(typeof(TrialState), reader.GetString(1), true),
                                 DatetimeStart = reader.GetDateTime(2),
                                 DatetimeComplete = completeTime
                             };
@@ -610,7 +610,7 @@
         {
             string key = reader.GetString(0);
             string value = reader.GetString(1);
-            if (!string.IsNullOrEmpty(value) && value.Contains("[") && value.Contains("]"))
+            if (!string.IsNullOrEmpty(value) && value.Contains('[') && value.Contains(']'))
             {
                 //FIXME: This is a hack to handle the case where the value is a list of strings.
                 if (key.Contains("preference"))
@@ -626,7 +626,7 @@
                     }
                     catch (JsonReaderException)
                     {
-                        if (value.Contains("\""))
+                        if (value.Contains('"'))
                         {
                             value = value.Replace("\"", "");
                         }
@@ -636,7 +636,7 @@
             }
             else
             {
-                if (value.Contains("\""))
+                if (value.Contains('"'))
                 {
                     value = value.Replace("\"", "");
                 }

OptunaTests/OptunaTests.csproj

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net48; net7.0-windows</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

Tunny.Core/Settings/Sampler.cs

@@ -17,6 +17,7 @@
         public AutoSampler Auto { get; set; } = new AutoSampler();
         public MOEADSampler MOEAD { get; set; } = new MOEADSampler();
         public MoCmaEsSampler MoCmaEs { get; set; } = new MoCmaEsSampler();
+        public DESampler DE { get; set; } = new DESampler();
 
         // Optuna
         public RandomSampler Random { get; set; } = new RandomSampler();
@@ -71,6 +72,9 @@
                 case SamplerType.MoCmaEs:
                     optunaSampler = MoCmaEs.ToPython();
                     break;
+                case SamplerType.DE:
+                    optunaSampler = DE.ToPython();
+                    break;
                 default:
                     throw new ArgumentException("Invalid sampler type.");
             }

Tunny.Core/TEnum/SamplerType.cs

@@ -16,5 +16,6 @@ public enum SamplerType
         AUTO = 11,
         MoCmaEs = 12,
         MOEAD = 13,
+        DE = 14,
     }
 }

Tunny.Core/Tunny.Core.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net48; net7.0-windows</TargetFrameworks>
+    <NoWarn>NU1701;NETSDK1086</NoWarn>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>
     <AnalysisLevel>latest-recommended</AnalysisLevel>
-    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

Tunny.CoreTests/Tunny.CoreTests.csproj

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net48</TargetFramework>
+    <TargetFrameworks>net48; net7.0-windows</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
-    <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 
   <ItemGroup>

Tunny/Component/LoadingInstruction/InitializeCef_Tunny.cs

@@ -1,7 +1,5 @@
 using System;
 
-using CefSharp;
-
 using Grasshopper.Kernel;
 
 using Tunny.Core.Util;
@@ -21,7 +19,9 @@ private static void InitializeCefRuntimeResolver()
         {
             try
             {
-                CefRuntime.SubscribeAnyCpuAssemblyResolver(TEnvVariables.ComponentFolder);
+#if NET48
+                CefSharp.CefRuntime.SubscribeAnyCpuAssemblyResolver(TEnvVariables.ComponentFolder);
+#endif
             }
             catch (Exception e)
             {

Tunny/Component/Util/FishMarket.cs

@@ -22,7 +22,7 @@
     public class FishMarket : GH_Component
     {
         private readonly List<Plane> _tagPlanes = new List<Plane>();
-        private List<GH_Fish> _fishes = new List<GH_Fish>();
+        private readonly List<GH_Fish> _fishes = new List<GH_Fish>();
         private double _size = 1;
         private Settings _settings = new Settings();
 
@@ -83,9 +83,10 @@
 
         private GH_Structure<IGH_GeometricGoo> ArrayedGeometries(IEnumerable<object> fishObjects)
         {
-            int countY = 0;
-            var arrayedGeometries = new GH_Structure<IGH_GeometricGoo>();
-            _fishes = fishObjects.Select(x => (GH_Fish)x).ToList();
+            throw new NotImplementedException();
+            // int countY = 0;
+            // var arrayedGeometries = new GH_Structure<IGH_GeometricGoo>();
+            // _fishes = fishObjects.Select(x => (GH_Fish)x).ToList();
 
             // while (true)
             // {
@@ -98,7 +99,7 @@
             //     countY++;
             // }
 
-            return arrayedGeometries;
+            // return arrayedGeometries;
         }
 
         private bool SetGeometryToResultArray(int countY, GH_Structure<IGH_GeometricGoo> arrayedGeometries, List<List<GeometryBase>> fishGeometries)