From a6cc0aeb14185547a590415d99d4d20630f7f2d4 Mon Sep 17 00:00:00 2001
From: Declan Taylor <Declan.Taylor@chartco.com>
Date: Wed, 20 Nov 2019 11:11:51 +0000
Subject: [PATCH] Changes

Created new console app, refactored UI app, created new netstandard class library with new namespaceOO-1301 Changed Process to IntrPtr type as parameter for GetMainModuleFileName
---
 Dyqui.ConsoleDemo/Dyqui.ConsoleDemo.csproj    |  16 ++
 Dyqui.ConsoleDemo/Program.cs                  |  85 +++++++++
 Dyquo.Charts3d/Dyquo.Charts3d.csproj          |  10 +-
 Dyquo.Charts3d/packages.config                |   4 +-
 Dyquo.Optimization.UI/App.config              |  14 +-
 .../Dyquo.Optimization.UI.csproj              |  62 +++++-
 Dyquo.Optimization.UI/MainWindow.xaml         |  14 +-
 Dyquo.Optimization.UI/MainWindow.xaml.cs      | 119 ++++++------
 Dyquo.Optimization.UI/ParticlesViewModel.cs   |   4 +-
 Dyquo.Optimization.UI/packages.config         |  15 +-
 Dyquo.PSO/Class1.cs                           |   8 +
 Dyquo.PSO/Dyquo.PSO.csproj                    |   8 +
 Dyquo.PSO/Extensions.cs                       |  32 ++++
 Dyquo.PSO/Particle.cs                         |  28 +++
 Dyquo.PSO/Result.cs                           |  15 ++
 Dyquo.PSO/Solver.cs                           | 180 ++++++++++++++++++
 Dyquo.PSO/SolverData.cs                       |  23 +++
 Dyquo.PSO/SolverOptions.cs                    |  28 +++
 ParticleSwarmOptimization.sln                 |  25 ++-
 19 files changed, 601 insertions(+), 89 deletions(-)
 create mode 100644 Dyqui.ConsoleDemo/Dyqui.ConsoleDemo.csproj
 create mode 100644 Dyqui.ConsoleDemo/Program.cs
 create mode 100644 Dyquo.PSO/Class1.cs
 create mode 100644 Dyquo.PSO/Dyquo.PSO.csproj
 create mode 100644 Dyquo.PSO/Extensions.cs
 create mode 100644 Dyquo.PSO/Particle.cs
 create mode 100644 Dyquo.PSO/Result.cs
 create mode 100644 Dyquo.PSO/Solver.cs
 create mode 100644 Dyquo.PSO/SolverData.cs
 create mode 100644 Dyquo.PSO/SolverOptions.cs

diff --git a/Dyqui.ConsoleDemo/Dyqui.ConsoleDemo.csproj b/Dyqui.ConsoleDemo/Dyqui.ConsoleDemo.csproj
new file mode 100644
index 0000000..a3d0ab9
--- /dev/null
+++ b/Dyqui.ConsoleDemo/Dyqui.ConsoleDemo.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Reactive" Version="4.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Dyquo.PSO\Dyquo.PSO.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/Dyqui.ConsoleDemo/Program.cs b/Dyqui.ConsoleDemo/Program.cs
new file mode 100644
index 0000000..3b5ea81
--- /dev/null
+++ b/Dyqui.ConsoleDemo/Program.cs
@@ -0,0 +1,85 @@
+
+namespace Dyqui.ConsoleDemo
+{
+    using System;
+    using System.Linq;
+    using System.Reactive.Linq;
+
+    using Dyqui.PSO;
+
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            RunSolver();
+            Console.ReadLine();
+        }
+
+        private static async void RunSolver()
+        {
+            var solver = new Solver(ErrorFunction, GetPsoSolverOptions());
+            var data = solver.Initialize();
+
+            GetParticleUpdates(solver)
+                .Subscribe(particles =>
+                {
+                    var result = particles.Where(p => p.Error != 0).Select(p => (xy: p.BestPosition, score: 1 / p.Error)).ToArray();
+                    var x = result.WeightedAverage(a => a.xy[0], a => a.score);
+                    var y = result.WeightedAverage(a => a.xy[1], a => a.score);
+                    Console.WriteLine($"{x},{y}");
+                });
+            
+            _ = await solver.SolveAsync(data);
+        }
+
+
+        static IObservable<Particle[]> GetParticleUpdates(Solver solver)
+        {
+            return Observable.FromEvent<EpochDelegate, SolverData>( 
+                    onNextHandler => (s,  d) => onNextHandler(d),
+                    d => solver.AfterEpoch += d, 
+                    d => solver.AfterEpoch -= d)
+                .Select(d =>d.Particles);
+
+
+        }
+
+
+        static double ErrorFunction(double[] pos)
+        {
+            double target = -0.42888194;
+            //double target = -100000;        // To minimize without specific target
+
+            double f = Function2d(pos);
+
+            // Quadratic error
+            return (f - target) * (f - target);
+        }
+
+        static double Function2d(double x, double y)
+        {
+            return x * Math.Exp(-((x * x) + (y * y)));
+        }
+
+        static double Function2d(double[] pos)
+        {
+            var x = pos[0];
+            var y = pos[1];
+            return Function2d(x, y);
+        }
+
+        private static SolverOptions GetPsoSolverOptions() => new SolverOptions
+        {
+            NumDimensions = 2,
+            NumParticles = 50,
+            MaxEpochs = 500,
+            MinimumX = -10.0,
+            MaximumX = 10.0,
+            AcceptanceError = 0.00000000,
+            InertiaWeight = 0.729,
+            C1CognitiveWeight = 1.5,
+            C2SocialWeight = 1.5,
+            ParticleResetProbability = 0.001,
+        };
+    }
+}
diff --git a/Dyquo.Charts3d/Dyquo.Charts3d.csproj b/Dyquo.Charts3d/Dyquo.Charts3d.csproj
index 8730059..34be207 100644
--- a/Dyquo.Charts3d/Dyquo.Charts3d.csproj
+++ b/Dyquo.Charts3d/Dyquo.Charts3d.csproj
@@ -32,13 +32,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="HelixToolkit, Version=2015.1.715.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\helix-toolkit\Source\HelixToolkit.Wpf\bin\Debug\HelixToolkit.dll</HintPath>
+    <Reference Include="HelixToolkit, Version=2.10.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
+      <HintPath>..\packages\HelixToolkit.2.10.0\lib\netstandard1.1\HelixToolkit.dll</HintPath>
     </Reference>
-    <Reference Include="HelixToolkit.Wpf, Version=2015.1.715.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\helix-toolkit\Source\HelixToolkit.Wpf\bin\Debug\HelixToolkit.Wpf.dll</HintPath>
+    <Reference Include="HelixToolkit.Wpf, Version=2.10.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
+      <HintPath>..\packages\HelixToolkit.Wpf.2.10.0\lib\net45\HelixToolkit.Wpf.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Xml" />
diff --git a/Dyquo.Charts3d/packages.config b/Dyquo.Charts3d/packages.config
index b21aaca..d0d4f05 100644
--- a/Dyquo.Charts3d/packages.config
+++ b/Dyquo.Charts3d/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <!--<package id="HelixToolkit" version="2015.1.715" targetFramework="net461" />
-  <package id="HelixToolkit.Wpf" version="2015.1.715" targetFramework="net461" />-->
+  <package id="HelixToolkit" version="2.10.0" targetFramework="net461" />
+  <package id="HelixToolkit.Wpf" version="2.10.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Dyquo.Optimization.UI/App.config b/Dyquo.Optimization.UI/App.config
index 00bfd11..f1f670c 100644
--- a/Dyquo.Optimization.UI/App.config
+++ b/Dyquo.Optimization.UI/App.config
@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ComponentModel.Annotations" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.1.0" newVersion="4.2.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
\ No newline at end of file
diff --git a/Dyquo.Optimization.UI/Dyquo.Optimization.UI.csproj b/Dyquo.Optimization.UI/Dyquo.Optimization.UI.csproj
index f35b750..173ec12 100644
--- a/Dyquo.Optimization.UI/Dyquo.Optimization.UI.csproj
+++ b/Dyquo.Optimization.UI/Dyquo.Optimization.UI.csproj
@@ -14,6 +14,8 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,17 +37,24 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Eto, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Eto.Forms.2.2.0\lib\net45\Eto.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Eto, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Eto.Forms.2.4.1\lib\netstandard1.0\Eto.dll</HintPath>
     </Reference>
     <Reference Include="Eto.OxyPlot.Wpf, Version=1.0.5911.42160, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Eto.OxyPlot.Wpf.1.2.0-beta\lib\net45\Eto.OxyPlot.Wpf.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Eto.Wpf, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Eto.Platform.Wpf.2.2.0\lib\net45\Eto.Wpf.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Eto.Wpf, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Eto.Platform.Wpf.2.4.1\lib\net45\Eto.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="HelixToolkit, Version=2.10.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
+      <HintPath>..\packages\HelixToolkit.2.10.0\lib\netstandard1.1\HelixToolkit.dll</HintPath>
+    </Reference>
+    <Reference Include="HelixToolkit.Wpf, Version=2.10.0.0, Culture=neutral, PublicKeyToken=52aa3500039caf0d, processorArchitecture=MSIL">
+      <HintPath>..\packages\HelixToolkit.Wpf.2.10.0\lib\net45\HelixToolkit.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.3\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
     </Reference>
     <Reference Include="OxyPlot, Version=1.0.0.0, Culture=neutral, PublicKeyToken=638079a8f0bd61e9, processorArchitecture=MSIL">
       <HintPath>..\packages\OxyPlot.Core.1.0.0\lib\net45\OxyPlot.dll</HintPath>
@@ -55,8 +64,36 @@
       <HintPath>..\packages\OxyPlot.Wpf.1.0.0\lib\net45\OxyPlot.Wpf.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ReactiveProperty, Version=6.1.3.0, Culture=neutral, PublicKeyToken=910d1732782c71cb, processorArchitecture=MSIL">
+      <HintPath>..\packages\ReactiveProperty.6.1.4\lib\net461\ReactiveProperty.dll</HintPath>
+    </Reference>
+    <Reference Include="ReactiveProperty.NET46, Version=6.1.3.0, Culture=neutral, PublicKeyToken=3d1fed915120cbde, processorArchitecture=MSIL">
+      <HintPath>..\packages\ReactiveProperty.6.1.4\lib\net461\ReactiveProperty.NET46.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ComponentModel.Annotations.4.6.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Reactive, Version=4.2.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.4.2.0\lib\net46\System.Reactive.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -122,12 +159,19 @@
       <Project>{BBF1973F-289C-418B-B5E1-2251F77A4BB1}</Project>
       <Name>Dyquo.Charts3d</Name>
     </ProjectReference>
-    <ProjectReference Include="..\dyquo.optimization.swarm\Dyquo.Optimization.Swarm.csproj">
-      <Project>{01632468-842a-42eb-8cdb-31cc24e50e44}</Project>
-      <Name>Dyquo.Optimization.Swarm</Name>
+    <ProjectReference Include="..\Dyquo.PSO\Dyquo.PSO.csproj">
+      <Project>{1d7aa1ac-b358-4906-a36f-9007831cb7c8}</Project>
+      <Name>Dyquo.PSO</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\Eto.Forms.2.4.1\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.1\build\Eto.Forms.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\Eto.Forms.2.4.1\build\Eto.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Eto.Forms.2.4.1\build\Eto.Forms.targets'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Dyquo.Optimization.UI/MainWindow.xaml b/Dyquo.Optimization.UI/MainWindow.xaml
index 897daf9..985daf7 100644
--- a/Dyquo.Optimization.UI/MainWindow.xaml
+++ b/Dyquo.Optimization.UI/MainWindow.xaml
@@ -3,18 +3,24 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:Dyquo.Optimization.UI"
-        xmlns:Charts3d="clr-namespace:Dyquo.Charts3d;assembly=Dyquo.Charts3d"
+        xmlns:charts3d="clr-namespace:Dyquo.Charts3d;assembly=Dyquo.Charts3d"
         x:Class="Dyquo.Optimization.UI.MainWindow"
         mc:Ignorable="d"
         Title="Optimizer" Height="720" Width="1024">
     <Grid>
 
-        <Charts3d:Chart3d x:Name="Show3d"/>
+        <charts3d:Chart3d x:Name="Show3d"/>
 
         <Grid Height="98" VerticalAlignment="Top" Margin="0,0,0,0">
-            <Button x:Name="RunButton" Content="Run" Margin="9,12,0,0" VerticalAlignment="Top" Click="button_Click" Height="68" HorizontalAlignment="Left" Width="73" FontSize="26" Background="{x:Null}" BorderBrush="#FFC7AFAF"/>
+            <Button x:Name="RunButton" Content="Run" Margin="9,12,0,0" VerticalAlignment="Top" 
+                    Command="{Binding RunCommand}"
+                    Height="68" HorizontalAlignment="Left" Width="73" FontSize="26" Background="{x:Null}" BorderBrush="#FFC7AFAF"/>
 
-            <Label x:Name="StatusLabel" Content="Solver idle." HorizontalAlignment="Left" Margin="92,-1,0,0" VerticalAlignment="Top" Width="426" FontSize="26"/>
+            <Label x:Name="StatusLabel" Content="{Binding Status.Value}" HorizontalAlignment="Left" Margin="92,-1,0,0" VerticalAlignment="Top" Width="426" FontSize="26">
+                <Label.ContentStringFormat>
+                    Solver {0}
+                </Label.ContentStringFormat>
+            </Label>
             <Label Content="Goal is to find absolute minimum of the function." HorizontalAlignment="Left" Margin="94,36,0,0" VerticalAlignment="Top" Width="337"/>
             <Label x:Name="CycleInfoLabel" Content="" HorizontalAlignment="Left" Margin="94,56,0,0" VerticalAlignment="Top" Width="337"/>
 
diff --git a/Dyquo.Optimization.UI/MainWindow.xaml.cs b/Dyquo.Optimization.UI/MainWindow.xaml.cs
index df02cdb..5f14691 100644
--- a/Dyquo.Optimization.UI/MainWindow.xaml.cs
+++ b/Dyquo.Optimization.UI/MainWindow.xaml.cs
@@ -1,90 +1,100 @@
 using Dyquo.Charts3d;
-using Dyquo.Optimization.Swarm;
+using Dyqui.PSO;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Media3D;
-
+using System.Reactive;
 namespace Dyquo.Optimization.UI
 {
+    using System.Reactive.Concurrency;
+    using System.Reactive.Linq;
+    using System.Reactive.Subjects;
+    using System.Windows.Input;
+
+    using Reactive.Bindings;
+
     /// <summary>
     /// Interaction logic for MainWindow.xaml
     /// </summary>
     public partial class MainWindow : Window
     {
-        private ParticlesViewModel mParticles;
+        private ParticlesViewModel particles;
+        private static readonly ISubject<bool> canExecute = new Subject<bool>();
 
         public MainWindow()
         {
             InitializeComponent();
+            this.DataContext = this;
+            (RunCommand as ReactiveCommand).Subscribe(async a => { canExecute.OnNext(false); await RunSolver(); canExecute.OnNext(true); });
         }
 
-        private async void button_Click(object sender, RoutedEventArgs e)
-        {
-            RunButton.IsEnabled = false;
+        public ICommand RunCommand { get; } = new ReactiveCommand(canExecute, true);
 
-            await RunSolver();
 
-            RunButton.IsEnabled = true;
-        }
+        public ReactiveProperty<string> Status { get; } = canExecute
+                                                        .Select(b => b ? "finished" : "running")
+                                                        .StartWith("ready")
+                                                        .ToReactiveProperty();
 
 
-        private async Task RunSolver()
+        private void SetUpUI(SolverData data)
         {
-            var solverOptions = new PSOSolverOptions
-            {
-                NumDimensions = 2,
-                NumParticles = 50,
-                MaxEpochs = 500,
-                MinimumX = -10.0,
-                MaximumX = 10.0,
-                AcceptanceError = 0.00000000,
-                InertiaWeight = 0.729,
-                C1CognitiveWeight = 1.5,
-                C2SocialWeight = 1.5,
-                ParticleResetProbability = 0.001,
-
-                // Slower convergence params for visualization
-
-                //VelocityInitialAtenuation = 0.01
-                //InertiaWeight = 0.02,
-                //C1CognitiveWeight = 0.05,
-                //C2SocialWeight = 0.05,
-            };
-
-            var solver = new PSOSolver(ErrorFunction, solverOptions);
-            var data = solver.Initialize();
-
-            if (mParticles == null)
+            if (this.particles == null)
             {
                 SetupFunctionPlot(data);
-                mParticles = SetupParticlesPlot(data);
+                this.particles = SetupParticlesPlot(data);
                 Show3d.ZoomExtents();
             }
-            
+        }
+
+        private async Task RunSolver()
+        {
+            var solver = new Solver(ErrorFunction, GetPsoSolverOptions());
+            var data = solver.Initialize();
+            this.SetUpUI(data);
 
             solver.AfterEpoch += (s, d) =>
-            {
-                Dispatcher.Invoke(() =>
-                {
-                    mParticles.UpdateParticles(d.Particles);
-                    mParticles.UpdateBest(d.BestGlobalPosition, Function2d(d.BestGlobalPosition));
-                    UpdateStatusLabels(d);
-                });
-
-                Task.Delay(30).Wait();
-            };
+           {
+               Dispatcher.Invoke(() =>
+               {
+                   this.particles.UpdateParticles(d.Particles);
+                   this.particles.UpdateBest(d.BestGlobalPosition, Function2d(d.BestGlobalPosition));
+                   UpdateStatusLabels(d);
+               });
 
-            StatusLabel.Content = "Particle Swarm Optimizer Running";
+               Task.Delay(30).Wait();
+           };
 
             var res = await solver.SolveAsync(data);
-
-            StatusLabel.Content = "Solver finished";
         }
 
-        private void SetupFunctionPlot(PSOSolverData data)
+
+
+        private SolverOptions GetPsoSolverOptions() => new SolverOptions
+        {
+            NumDimensions = 2,
+            NumParticles = 50,
+            MaxEpochs = 500,
+            MinimumX = -10.0,
+            MaximumX = 10.0,
+            AcceptanceError = 0.00000000,
+            InertiaWeight = 0.729,
+            C1CognitiveWeight = 1.5,
+            C2SocialWeight = 1.5,
+            ParticleResetProbability = 0.001,
+
+            // Slower convergence params for visualization
+
+            //VelocityInitialAtenuation = 0.01
+            //InertiaWeight = 0.02,
+            //C1CognitiveWeight = 0.05,
+            //C2SocialWeight = 0.05,
+        };
+
+        private void SetupFunctionPlot(SolverData data)
         {
             var surface = new Surface3dViewModel()
             {
@@ -98,15 +108,14 @@ private void SetupFunctionPlot(PSOSolverData data)
             Show3d.AddSurface(surface);
         }
 
-        private ParticlesViewModel SetupParticlesPlot(PSOSolverData data)
+        private ParticlesViewModel SetupParticlesPlot(SolverData data)
         {
             var result = new ParticlesViewModel();
             Show3d.AddContent(result.SetupParticles(data));
-
             return result;
         }
 
-        private void UpdateStatusLabels(PSOSolverData data)
+        private void UpdateStatusLabels(SolverData data)
         {
             CycleInfoLabel.Content = $"Cycle no. {data.Epoch}";
             BestStateLabel.Content = $"Solution at ({GetPositionString(data.BestGlobalPosition)})\nFunction value at position {Function2d(data.BestGlobalPosition)}"; // "\nError {data.BestGlobalError.ToString("F16")}";
@@ -124,7 +133,7 @@ static double ErrorFunction(double[] pos)
         {
             double target = -0.42888194;
             //double target = -100000;        // To minimize without specific target
-            
+
             double f = Function2d(pos);
 
             // Quadratic error
diff --git a/Dyquo.Optimization.UI/ParticlesViewModel.cs b/Dyquo.Optimization.UI/ParticlesViewModel.cs
index f45ba44..bdab005 100644
--- a/Dyquo.Optimization.UI/ParticlesViewModel.cs
+++ b/Dyquo.Optimization.UI/ParticlesViewModel.cs
@@ -1,5 +1,5 @@
 using Dyquo.Charts3d;
-using Dyquo.Optimization.Swarm;
+using Dyqui.PSO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,7 +12,7 @@ namespace Dyquo.Optimization.UI
 {
     public class ParticlesViewModel
     {
-        public Model3DGroup SetupParticles(PSOSolverData data)
+        public Model3DGroup SetupParticles(SolverData data)
         {
             mParticleModels.Clear();
 
diff --git a/Dyquo.Optimization.UI/packages.config b/Dyquo.Optimization.UI/packages.config
index 020dccb..0756bc5 100644
--- a/Dyquo.Optimization.UI/packages.config
+++ b/Dyquo.Optimization.UI/packages.config
@@ -1,8 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Eto.Forms" version="2.2.0" targetFramework="net461" />
+  <package id="Eto.Forms" version="2.4.1" targetFramework="net461" />
   <package id="Eto.OxyPlot.Wpf" version="1.2.0-beta" targetFramework="net461" />
-  <package id="Eto.Platform.Wpf" version="2.2.0" targetFramework="net461" />
+  <package id="Eto.Platform.Wpf" version="2.4.1" targetFramework="net461" />
+  <package id="HelixToolkit" version="2.10.0" targetFramework="net461" />
+  <package id="HelixToolkit.Wpf" version="2.10.0" targetFramework="net461" />
+  <package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.3" targetFramework="net461" />
   <package id="OxyPlot.Core" version="1.0.0" targetFramework="net461" />
   <package id="OxyPlot.Wpf" version="1.0.0" targetFramework="net461" />
+  <package id="ReactiveProperty" version="6.1.4" targetFramework="net461" />
+  <package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.6.0" targetFramework="net461" />
+  <package id="System.Reactive" version="4.2.0" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/Dyquo.PSO/Class1.cs b/Dyquo.PSO/Class1.cs
new file mode 100644
index 0000000..d409d20
--- /dev/null
+++ b/Dyquo.PSO/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Dyquo.PSO
+{
+    public class Class1
+    {
+    }
+}
diff --git a/Dyquo.PSO/Dyquo.PSO.csproj b/Dyquo.PSO/Dyquo.PSO.csproj
new file mode 100644
index 0000000..5ebf10b
--- /dev/null
+++ b/Dyquo.PSO/Dyquo.PSO.csproj
@@ -0,0 +1,8 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+</Project>
diff --git a/Dyquo.PSO/Extensions.cs b/Dyquo.PSO/Extensions.cs
new file mode 100644
index 0000000..a233e58
--- /dev/null
+++ b/Dyquo.PSO/Extensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public static class Extensions
+    {
+        public static double[] Clone2(this double[] source)
+        {
+            var result = new double[source.Length];
+            source.CopyTo(result, 0);
+            return result;
+        }
+
+
+
+        public static double WeightedAverage<T>(this IEnumerable<T> records, Func<T, double> value, Func<T, double> weight)
+        {
+            double weightedValueSum = records.Sum(x => value(x) * weight(x));
+            double weightSum = records.Sum(x => weight(x));
+
+            if (weightSum != 0)
+                return weightedValueSum / weightSum;
+            else
+                throw new DivideByZeroException("The sum of weights equals 0.");
+        }
+
+    }
+}
diff --git a/Dyquo.PSO/Particle.cs b/Dyquo.PSO/Particle.cs
new file mode 100644
index 0000000..50e30c8
--- /dev/null
+++ b/Dyquo.PSO/Particle.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public class Particle
+    {
+        public double[] Position;
+        public double[] Velocity;
+        public double[] BestPosition;
+        public double Error;
+        public double BestError;
+
+
+        public Particle(double[] position, double[] velocity, double[] bestPosition, double err, double bestError)
+        {
+            Position = position.Clone2();
+            Velocity = velocity.Clone2();
+            BestPosition = bestPosition.Clone2();
+            
+            BestError = bestError;
+            Error = err;
+        }
+    }
+}
diff --git a/Dyquo.PSO/Result.cs b/Dyquo.PSO/Result.cs
new file mode 100644
index 0000000..7a642d9
--- /dev/null
+++ b/Dyquo.PSO/Result.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public class Result
+    {
+        public double[] BestPosition;
+        public double BestError;
+        public bool Success;
+    }
+}
diff --git a/Dyquo.PSO/Solver.cs b/Dyquo.PSO/Solver.cs
new file mode 100644
index 0000000..fffc445
--- /dev/null
+++ b/Dyquo.PSO/Solver.cs
@@ -0,0 +1,180 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public class Solver
+    {
+        public event EpochDelegate AfterEpoch;
+
+
+        public Solver(ErrorFunctionDelegate errFunc, SolverOptions options)
+        {
+            mErrorFunction = errFunc;
+            mOptions = options;
+            mRandom = new Random(options.RandomSeed);
+        }
+
+        public SolverData Initialize()
+        {
+            var data = new SolverData(mOptions.NumParticles, mOptions.NumDimensions);
+
+            // swarm initialization
+            for (int i = 0; i < data.Particles.Length; ++i)
+            {
+                double[] randomPosition = new double[mOptions.NumDimensions];
+                for (int j = 0; j < randomPosition.Length; ++j)
+                {
+                    randomPosition[j] = GetRandomPosition();
+                }
+
+                double error = mErrorFunction(randomPosition);
+                double[] randomVelocity = new double[mOptions.NumDimensions];
+
+                for (int j = 0; j < randomVelocity.Length; ++j)
+                {
+                    double lo = mOptions.MinimumX * mOptions.VelocityInitialAtenuation;
+                    double hi = mOptions.MaximumX * mOptions.VelocityInitialAtenuation;
+                    randomVelocity[j] = (hi - lo) * mRandom.NextDouble() + lo;
+                }
+
+                data.Particles[i] = new Particle(randomPosition, randomVelocity, randomPosition, error, error);
+
+                // global best position/solution?
+                if (data.Particles[i].Error < data.BestGlobalError)
+                {
+                    data.BestGlobalError = data.Particles[i].Error;
+                    data.Particles[i].Position.CopyTo(data.BestGlobalPosition, 0);
+                }
+            }
+
+            return data;
+        }
+
+
+        public async Task<Result> SolveAsync(SolverData data)
+        {
+            return await Task.Run(() => Solve(data));
+        }
+        
+
+        public Result Solve(SolverData data)
+        {
+            double[] newVelocity = new double[mOptions.NumDimensions];
+            double[] newPosition = new double[mOptions.NumDimensions];
+            double newError;
+            var result = new Result();
+
+            while (data.Epoch < mOptions.MaxEpochs)
+            {
+                foreach (var particle in data.Particles)
+                {
+                    // Update velocity
+                    for (int j = 0; j < mOptions.NumDimensions; ++j)
+                    {
+                        double r1 = mRandom.NextDouble(); // cognitive and social randomizations
+                        double r2 = mRandom.NextDouble();
+
+                        newVelocity[j] = (mOptions.InertiaWeight * particle.Velocity[j]) +
+                            (mOptions.C1CognitiveWeight * r1 * (particle.BestPosition[j] - particle.Position[j])) +
+                            (mOptions.C2SocialWeight * r2 * (data.BestGlobalPosition[j] - particle.Position[j]));
+                    }
+
+                    newVelocity.CopyTo(particle.Velocity, 0);
+
+
+                    // Update position
+                    for (int j = 0; j < mOptions.NumDimensions; ++j)
+                    {
+                        newPosition[j] = particle.Position[j] + newVelocity[j];
+
+                        if (newPosition[j] < mOptions.MinimumX)
+                        {
+                            newPosition[j] = mOptions.MinimumX;
+                        }
+                        else if (newPosition[j] > mOptions.MaximumX)
+                        {
+                            newPosition[j] = mOptions.MaximumX;
+                        }
+                    }
+
+                    newPosition.CopyTo(particle.Position, 0);
+
+
+                    // Check error of new position and update if improved
+                    newError = mErrorFunction(newPosition);
+                    particle.Error = newError;
+
+                    if (newError < particle.BestError)
+                    {
+                        newPosition.CopyTo(particle.BestPosition, 0);
+                        particle.BestError = newError;
+                    }
+
+                    if (newError < data.BestGlobalError)
+                    {
+                        newPosition.CopyTo(data.BestGlobalPosition, 0);
+                        data.BestGlobalError = newError;
+                    }
+
+
+                    // death?
+                    double die = mRandom.NextDouble();
+
+                    if (die < mOptions.ParticleResetProbability)
+                    {
+                        for (int j = 0; j < mOptions.NumDimensions; ++j)
+                        {
+                            particle.Position[j] = GetRandomPosition();
+                        }
+
+                        particle.Error = mErrorFunction(particle.Position);
+                        particle.BestError = particle.Error;
+                        particle.Position.CopyTo(particle.BestPosition, 0);
+
+                        if (particle.Error < data.BestGlobalError)
+                        {
+                            data.BestGlobalError = particle.Error;
+                            particle.Position.CopyTo(data.BestGlobalPosition, 0);
+                        }
+                    }
+
+                } 
+
+                AfterEpoch?.Invoke(this, data);
+
+                ++data.Epoch;
+
+                if (data.BestGlobalError < mOptions.AcceptanceError)
+                {
+                    result.Success = true;
+                    break;
+                }
+            }
+            
+            result.BestPosition = data.BestGlobalPosition.Clone2();
+            result.BestError = data.BestGlobalError;
+
+            return result;
+        }
+
+        private double GetRandomPosition()
+        {
+            return (mOptions.MaximumX - mOptions.MinimumX) * mRandom.NextDouble() + mOptions.MinimumX;
+        }
+
+        private ErrorFunctionDelegate mErrorFunction;
+        private SolverOptions mOptions;
+        private Random mRandom;
+    }
+
+
+    public delegate double ErrorFunctionDelegate(double[] values);
+    public delegate void EpochDelegate(Solver sender, SolverData data);
+}
+
+
+
diff --git a/Dyquo.PSO/SolverData.cs b/Dyquo.PSO/SolverData.cs
new file mode 100644
index 0000000..e72677a
--- /dev/null
+++ b/Dyquo.PSO/SolverData.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public class SolverData
+    {
+        public Particle[] Particles;
+        public double[] BestGlobalPosition;
+        public double BestGlobalError;
+        public int Epoch = 0;
+
+        public SolverData(int numParticles, int numDimensions)
+        {
+            Particles = new Particle[numParticles];
+            BestGlobalPosition = new double[numDimensions];
+            BestGlobalError = double.MaxValue;
+        }
+    }
+}
diff --git a/Dyquo.PSO/SolverOptions.cs b/Dyquo.PSO/SolverOptions.cs
new file mode 100644
index 0000000..494a6fc
--- /dev/null
+++ b/Dyquo.PSO/SolverOptions.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Dyqui.PSO
+{
+    public class SolverOptions
+    {
+        public int NumDimensions;
+        public int NumParticles;
+        public double MinimumX;
+        public double MaximumX;
+        public int MaxEpochs;
+        public double AcceptanceError;
+
+        public double InertiaWeight = 0.729;
+        public double C1CognitiveWeight = 1.49445;
+        public double C2SocialWeight = 1.49445;
+
+        public double VelocityInitialAtenuation = 0.1;
+
+        public double ParticleResetProbability = 0.0;
+
+        public int RandomSeed = 0;
+    }
+}
diff --git a/ParticleSwarmOptimization.sln b/ParticleSwarmOptimization.sln
index bb55c48..3f53b01 100644
--- a/ParticleSwarmOptimization.sln
+++ b/ParticleSwarmOptimization.sln
@@ -1,24 +1,22 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.757
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyquo.Optimization.Swarm", "dyquo.optimization.swarm\Dyquo.Optimization.Swarm.csproj", "{01632468-842A-42EB-8CDB-31CC24E50E44}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyquo.Optimization.UI", "Dyquo.Optimization.UI\Dyquo.Optimization.UI.csproj", "{6CE81BB5-2537-4E02-BF6E-6DD4F248A7E5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyquo.Charts3d", "Dyquo.Charts3d\Dyquo.Charts3d.csproj", "{BBF1973F-289C-418B-B5E1-2251F77A4BB1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyqui.ConsoleDemo", "Dyqui.ConsoleDemo\Dyqui.ConsoleDemo.csproj", "{B4464574-473B-41B3-A86B-7A7B5550AE6A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dyquo.PSO", "Dyquo.PSO\Dyquo.PSO.csproj", "{1D7AA1AC-B358-4906-A36F-9007831CB7C8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{01632468-842A-42EB-8CDB-31CC24E50E44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{01632468-842A-42EB-8CDB-31CC24E50E44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{01632468-842A-42EB-8CDB-31CC24E50E44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{01632468-842A-42EB-8CDB-31CC24E50E44}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6CE81BB5-2537-4E02-BF6E-6DD4F248A7E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CE81BB5-2537-4E02-BF6E-6DD4F248A7E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CE81BB5-2537-4E02-BF6E-6DD4F248A7E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -27,8 +25,19 @@ Global
 		{BBF1973F-289C-418B-B5E1-2251F77A4BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBF1973F-289C-418B-B5E1-2251F77A4BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBF1973F-289C-418B-B5E1-2251F77A4BB1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4464574-473B-41B3-A86B-7A7B5550AE6A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4464574-473B-41B3-A86B-7A7B5550AE6A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4464574-473B-41B3-A86B-7A7B5550AE6A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4464574-473B-41B3-A86B-7A7B5550AE6A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1D7AA1AC-B358-4906-A36F-9007831CB7C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1D7AA1AC-B358-4906-A36F-9007831CB7C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1D7AA1AC-B358-4906-A36F-9007831CB7C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1D7AA1AC-B358-4906-A36F-9007831CB7C8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C2A025AE-FB19-4873-AAE8-51F30C775C03}
+	EndGlobalSection
 EndGlobal