- Timestamp:
- 04/09/21 12:44:50 (3 years ago)
- Location:
- branches/3040_VectorBasedGP
- Files:
-
- 21 added
- 4 deleted
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3040_VectorBasedGP/HeuristicLab.ExtLibs.sln
r17825 r17930 85 85 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MathNet.Numerics", "HeuristicLab.MathNet.Numerics\HeuristicLab.MathNet.Numerics.csproj", "{71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}" 86 86 EndProject 87 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TensorFlowNet", "HeuristicLab.TensorFlowNet\HeuristicLab.TensorFlowNet.csproj", "{C2E26343-88C7-4288-938B-EEE7C2ABBDB6}" 87 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNetILMerge", "HeuristicLab.ExtLibs\TensorFlowNet\TensorFlowNetILMerge.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}" 88 EndProject 89 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.TensorFlowNet", "HeuristicLab.ExtLibs\HeuristicLab.TensorFlowNet\HeuristicLab.TensorFlowNet.csproj", "{C2E26343-88C7-4288-938B-EEE7C2ABBDB6}" 88 90 ProjectSection(ProjectDependencies) = postProject 89 91 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3} = {99BF44AE-436E-4B30-9435-E2BA98EE6FB3} 90 92 EndProjectSection 91 93 EndProject 92 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TensorFlowNet", "TensorFlowNet\TensorFlowNet.csproj", "{99BF44AE-436E-4B30-9435-E2BA98EE6FB3}" 93 EndProject 94 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}" 94 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiffSharpILMerge", "HeuristicLab.ExtLibs\DiffSharp\DiffSharpILMerge.csproj", "{0C9D4608-1B14-404E-9932-F60E67B625BA}" 95 EndProject 96 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.DiffSharp", "HeuristicLab.ExtLibs\HeuristicLab.DiffSharp\HeuristicLab.DiffSharp.csproj", "{99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}" 97 ProjectSection(ProjectDependencies) = postProject 98 {0C9D4608-1B14-404E-9932-F60E67B625BA} = {0C9D4608-1B14-404E-9932-F60E67B625BA} 99 EndProjectSection 95 100 EndProject 96 101 Global … … 556 561 {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.ActiveCfg = Release|Any CPU 557 562 {71AE8AE6-F1A5-445C-AD31-AFFC83CE2E28}.Release|x86.Build.0 = Release|Any CPU 563 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 564 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU 565 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|x64 566 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|x64 567 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU 568 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU 569 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU 570 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.Build.0 = Release|Any CPU 571 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|x64 572 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|x64 573 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU 574 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU 558 575 {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 559 576 {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Debug|Any CPU.Build.0 = Debug|Any CPU … … 568 585 {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.ActiveCfg = Release|Any CPU 569 586 {C2E26343-88C7-4288-938B-EEE7C2ABBDB6}.Release|x86.Build.0 = Release|Any CPU 570 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 571 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU 572 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.ActiveCfg = Debug|x64 573 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x64.Build.0 = Debug|x64 574 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.ActiveCfg = Debug|Any CPU 575 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Debug|x86.Build.0 = Debug|Any CPU 576 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU 577 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|Any CPU.Build.0 = Release|Any CPU 578 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.ActiveCfg = Release|x64 579 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x64.Build.0 = Release|x64 580 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.ActiveCfg = Release|Any CPU 581 {99BF44AE-436E-4B30-9435-E2BA98EE6FB3}.Release|x86.Build.0 = Release|Any CPU 587 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|Any CPU.ActiveCfg = Debug|x64 588 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x64.ActiveCfg = Debug|x64 589 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x64.Build.0 = Debug|x64 590 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Debug|x86.ActiveCfg = Debug|x64 591 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|Any CPU.ActiveCfg = Release|x64 592 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x64.ActiveCfg = Release|x64 593 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x64.Build.0 = Release|x64 594 {0C9D4608-1B14-404E-9932-F60E67B625BA}.Release|x86.ActiveCfg = Release|x64 582 595 {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|Any CPU.ActiveCfg = Debug|x64 583 596 {99935EB6-C98F-4524-A8E2-94C8F6A0C8D9}.Debug|x64.ActiveCfg = Debug|x64 -
branches/3040_VectorBasedGP/HeuristicLab.ExtLibs/HeuristicLab.Protobuf/3.6.1/HeuristicLab.Protobuf.csproj
r17725 r17930 61 61 <ItemGroup> 62 62 <PackageReference Include="Google.Protobuf"> 63 <Version>3. 11.3</Version>63 <Version>3.6.1</Version> 64 64 </PackageReference> 65 65 </ItemGroup> -
branches/3040_VectorBasedGP/HeuristicLab.MathNet.Numerics/HeuristicLab.MathNet.Numerics.csproj
r17759 r17930 56 56 </PropertyGroup> 57 57 <ItemGroup> 58 <Reference Include="HEAL.Attic"> 58 <Reference Include="HEAL.Attic, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 59 <SpecificVersion>False</SpecificVersion> 59 60 <HintPath>..\bin\HEAL.Attic.dll</HintPath> 60 61 </Reference> … … 72 73 </ItemGroup> 73 74 <ItemGroup> 75 <ProjectReference Include="..\HeuristicLab.ExtLibs\HeuristicLab.Attic\1.0.0\HeuristicLab.Attic.csproj"> 76 <Project>{44a10478-d290-43c2-9757-f08f5292fea5}</Project> 77 <Name>HeuristicLab.Attic</Name> 78 </ProjectReference> 74 79 <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 75 80 <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project> … … 78 83 </ItemGroup> 79 84 <ItemGroup> 80 <PackageReference Include="Google.Protobuf">81 <Version>3.11.3</Version>82 </PackageReference>83 85 <PackageReference Include="MathNet.Numerics.Signed"> 84 86 <Version>4.9.0</Version> -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj
r17786 r17930 110 110 <Private>False</Private> 111 111 </Reference> 112 <Reference Include="DiffSharp , Version=0.7.7.0, Culture=neutral, processorArchitecture=AMD64">112 <Reference Include="DiffSharp.Merged, Version=0.8.4.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64"> 113 113 <SpecificVersion>False</SpecificVersion> 114 <HintPath>..\..\bin\DiffSharp. dll</HintPath>114 <HintPath>..\..\bin\DiffSharp.Merged.dll</HintPath> 115 115 </Reference> 116 116 <Reference Include="MathNet.Numerics"> … … 118 118 <Private>False</Private> 119 119 </Reference> 120 <Reference Include="netstandard" /> 120 121 <Reference Include="System" /> 121 122 <Reference Include="System.Core"> … … 132 133 <Reference Include="System.Data" /> 133 134 <Reference Include="System.Xml" /> 134 <Reference Include="TensorFlow.NET. Signed">135 < HintPath>..\..\bin\TensorFlow.NET.Signed.dll</HintPath>136 < Private>False</Private>135 <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 136 <SpecificVersion>False</SpecificVersion> 137 <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath> 137 138 </Reference> 138 139 </ItemGroup> -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/NonlinearLeastSquaresVectorConstantOptimizationEvaluator.cs
r17786 r17930 117 117 alglib.ndimensional_func alglib_func = (double[] x, ref double func, object o) => { 118 118 var vars = new DV(x); 119 func = loss(vars);119 func = (double)loss(vars); 120 120 var cnt = (EvaluationsCounter)o; 121 121 cnt.FunctionEvaluations++; … … 123 123 alglib.ndimensional_grad alglib_grad = (double[] x, ref double func, double[] grad, object o) => { 124 124 var vars = new DV(x); 125 func = loss(vars);126 Array.Copy( lossGrad(vars), grad, x.Length);125 func = (double)loss(vars); 126 Array.Copy((double[])lossGrad(vars), grad, x.Length); 127 127 var cnt = (EvaluationsCounter)o; 128 128 cnt.GradientEvaluations++; … … 130 130 alglib.ndimensional_hess alglib_hess = (double[] x, ref double func, double[] grad, double[,] hess, object o) => { 131 131 var vars = new DV(x); 132 func = loss(vars);133 Array.Copy( lossGrad(vars), grad, x.Length);134 Array.Copy( lossHess(vars), hess, x.Length * x.Length);132 func = (double)loss(vars); 133 Array.Copy((double[])lossGrad(vars), grad, x.Length); 134 Array.Copy((double[,])lossHess(vars), hess, x.Length * x.Length); 135 135 var cnt = (EvaluationsCounter)o; 136 136 cnt.HessianEvaluations++; -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToDiffSharpConverter.cs
r17786 r17930 271 271 var terms = node.Subtrees.Select(ConvertNode).ToList(); 272 272 if (terms.Count == 1) return FunctionApply(terms[0], 273 s => -s,273 s => D.Neg(s), 274 274 v => DV.Neg(v)); 275 275 return terms.Aggregate((a, b) => … … 288 288 (s1, v2) => s1 * v2, 289 289 (v1, s2) => v1 * s2, 290 (v1, v2) => DV. op_DotMultiply(v1, v2)290 (v1, v2) => DV.PointwiseMultiply(v1, v2) 291 291 )); 292 292 } … … 301 301 (s1, v2) => s1 / v2, 302 302 (v1, s2) => v1 / s2, 303 (v1, v2) => DV. op_DotDivide(v1, v2)303 (v1, v2) => DV.PointwiseDivision(v1, v2) 304 304 )); 305 305 } … … 345 345 return FunctionApply(ConvertNode(node.GetSubtree(0)), 346 346 s => D.Sign(s) * D.Pow(D.Abs(s), 1.0 / 3.0), 347 v => DV. op_DotMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0))347 v => DV.PointwiseMultiply(DV.Sign(v), DV.Pow(DV.Abs(v), 1.0 / 3.0)) 348 348 ); 349 349 } -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj
r17830 r17930 113 113 <Private>False</Private> 114 114 </Reference> 115 <Reference Include="DiffSharp , Version=0.7.7.0, Culture=neutral, processorArchitecture=AMD64">115 <Reference Include="DiffSharp.Merged, Version=0.8.4.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=AMD64"> 116 116 <SpecificVersion>False</SpecificVersion> 117 <HintPath>..\..\bin\DiffSharp. dll</HintPath>117 <HintPath>..\..\bin\DiffSharp.Merged.dll</HintPath> 118 118 </Reference> 119 119 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> … … 130 130 <HintPath>..\..\bin\MathNet.Numerics.dll</HintPath> 131 131 </Reference> 132 <Reference Include="netstandard" /> 132 133 <Reference Include="System" /> 133 134 <Reference Include="System.Core"> … … 143 144 <Reference Include="System.Data" /> 144 145 <Reference Include="System.Xml" /> 145 <Reference Include="TensorFlow.NET. Signed, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">146 <Reference Include="TensorFlow.NET.Merged, Version=0.15.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 146 147 <SpecificVersion>False</SpecificVersion> 147 <HintPath>..\..\bin\TensorFlow.NET. Signed.dll</HintPath>148 <HintPath>..\..\bin\TensorFlow.NET.Merged.dll</HintPath> 148 149 </Reference> 149 150 </ItemGroup> -
branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs
r17830 r17930 785 785 s => 0, 786 786 v => { 787 int bins = (int)Math.Round(m.Scalar);787 int bins = Math.Max((int)Math.Round(m.Scalar), 1); 788 788 double minValue = v.Minimum(); 789 789 double maxValue = v.Maximum(); … … 794 794 double binMin = minValue * i; 795 795 double binMax = binMin + intervalWidth; 796 double countBin = v.Map(e => (e > binMin && e < binMax) ? 1 :0).Sum();796 double countBin = v.Map(e => (e > binMin && e < binMax) ? 1.0 : 0.0).Sum(); 797 797 double percBin = countBin / totalValues; 798 798 sum += percBin * Math.Log(percBin); … … 808 808 cur = AggregateApply(cur, 809 809 s => 0, 810 v => Statistics.PopulationStandardDeviation(v) > (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1 :0);810 v => Statistics.PopulationStandardDeviation(v) > (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1.0 : 0.0); 811 811 TraceEvaluation(currentInstr, cur); 812 812 return cur; … … 816 816 cur = AggregateApply(cur, 817 817 s => 0, 818 v => Statistics.PopulationVariance(v) > Statistics.StandardDeviation(v) ? 1 :0);818 v => Statistics.PopulationVariance(v) > Statistics.StandardDeviation(v) ? 1.0 : 0.0); 819 819 TraceEvaluation(currentInstr, cur); 820 820 return cur; … … 824 824 cur = AggregateApply(cur, 825 825 s => 0, 826 v => Math.Abs(Statistics.Mean(v) - Statistics.Median(v)) < (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1 :0);826 v => Math.Abs(Statistics.Mean(v) - Statistics.Median(v)) < (Statistics.Maximum(v) - Statistics.Minimum(v)) / 2 ? 1.0 : 0.0); 827 827 TraceEvaluation(currentInstr, cur); 828 828 return cur; … … 834 834 v => { 835 835 double mean = Statistics.Mean(v); 836 return v.Map(e => e > mean ? 1 :0).Sum();836 return v.Map(e => e > mean ? 1.0 : 0.0).Sum(); 837 837 }); 838 838 TraceEvaluation(currentInstr, cur); … … 845 845 v => { 846 846 double median = Statistics.Median(v); 847 return v.Map(e => e > median ? 1 :0).Sum();847 return v.Map(e => e > median ? 1.0 : 0.0).Sum(); 848 848 }); 849 849 TraceEvaluation(currentInstr, cur); … … 856 856 v => { 857 857 double mean = Statistics.Mean(v); 858 return v.Map(e => e < mean ? 1 :0).Sum();858 return v.Map(e => e < mean ? 1.0 : 0.0).Sum(); 859 859 }); 860 860 TraceEvaluation(currentInstr, cur); … … 867 867 v => { 868 868 double median = Statistics.Median(v); 869 return v.Map(e => e < median ? 1 :0).Sum();869 return v.Map(e => e < median ? 1.0 : 0.0).Sum(); 870 870 }); 871 871 TraceEvaluation(currentInstr, cur); … … 1055 1055 v => { 1056 1056 double sum = 0.0; 1057 int l = (int)Math.Round(lVal.Scalar);1057 int l = Math.Max((int)Math.Round(lVal.Scalar), 0); 1058 1058 double mean = Statistics.Mean(v); 1059 1059 for (int i = 0; i < v.Count - l; i++) { … … 1106 1106 s => 0, 1107 1107 v => { 1108 int lag = (int)Math.Round(l.Scalar);1108 int lag = Math.Max((int)Math.Round(l.Scalar), 0); 1109 1109 double sum = 0.0; 1110 1110 for (int i = 0; i < v.Count - 2 * lag; i++) { -
branches/3040_VectorBasedGP/HeuristicLab.Problems.ExternalEvaluation.GP/3.5/Plugin.cs.frame
r17184 r17930 32 32 [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")] 33 33 [PluginDependency("HeuristicLab.Problems.ExternalEvaluation", "3.4")] 34 [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]34 //[PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")] 35 35 public class HeuristicLabProblemsExternalEvaluationGPPlugin : PluginBase { 36 36 } -
branches/3040_VectorBasedGP/HeuristicLab.Problems.ExternalEvaluation/3.4/Plugin.cs.frame
r17184 r17930 34 34 [PluginDependency("HeuristicLab.Optimization", "3.3")] 35 35 [PluginDependency("HeuristicLab.Parameters", "3.3")] 36 [PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")]36 //[PluginDependency("HeuristicLab.ProtobufCS", "2.4.1.473")] 37 37 [PluginDependency("HeuristicLab.Scripting", "3.3")] 38 38 public class HeuristicLabProblemsExternalEvaluationPlugin : PluginBase { -
branches/3040_VectorBasedGP/HeuristicLab/3.3/HeuristicLab-3.3.csproj
r17759 r17930 111 111 <ApplicationManifest>app.manifest</ApplicationManifest> 112 112 </PropertyGroup> 113 <PropertyGroup> 114 <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> 115 </PropertyGroup> 113 116 <ItemGroup> 114 117 <Reference Include="System" /> … … 192 195 </BootstrapperPackage> 193 196 </ItemGroup> 194 <ItemGroup>195 <PackageReference Include="Google.Protobuf">196 <Version>3.11.3</Version>197 </PackageReference>198 </ItemGroup>199 197 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 200 198 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Note: See TracChangeset
for help on using the changeset viewer.