Changeset 16549 for branches/2971_named_intervals
- Timestamp:
- 01/23/19 14:34:50 (6 years ago)
- Location:
- branches/2971_named_intervals
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r14255 r16549 41 41 <DebugType>full</DebugType> 42 42 <Optimize>false</Optimize> 43 <OutputPath> $(SolutionDir)\bin\</OutputPath>43 <OutputPath>..\..\..\..\trunk\bin\</OutputPath> 44 44 <DefineConstants>DEBUG;TRACE</DefineConstants> 45 45 <ErrorReport>prompt</ErrorReport> … … 106 106 <Private>False</Private> 107 107 </Reference> 108 <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 109 <SpecificVersion>False</SpecificVersion> 110 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath> 111 </Reference> 112 <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 113 <SpecificVersion>False</SpecificVersion> 114 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath> 115 </Reference> 116 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 117 <SpecificVersion>False</SpecificVersion> 118 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath> 119 </Reference> 120 <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 121 <SpecificVersion>False</SpecificVersion> 122 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath> 123 </Reference> 124 <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 125 <SpecificVersion>False</SpecificVersion> 126 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath> 127 </Reference> 128 <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 129 <SpecificVersion>False</SpecificVersion> 130 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath> 131 </Reference> 132 <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 133 <SpecificVersion>False</SpecificVersion> 134 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath> 135 </Reference> 136 <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 137 <SpecificVersion>False</SpecificVersion> 138 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll</HintPath> 139 </Reference> 140 <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 141 <SpecificVersion>False</SpecificVersion> 142 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath> 143 </Reference> 144 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 145 <SpecificVersion>False</SpecificVersion> 146 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath> 147 </Reference> 148 <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 149 <SpecificVersion>False</SpecificVersion> 150 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 151 </Reference> 152 <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 153 <SpecificVersion>False</SpecificVersion> 154 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 155 </Reference> 156 <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 157 <SpecificVersion>False</SpecificVersion> 158 <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath> 159 </Reference> 108 160 <Reference Include="System" /> 109 161 <Reference Include="System.Core"> … … 206 258 </ItemGroup> 207 259 <ItemGroup> 208 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">209 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>210 <Name>HeuristicLab.Collections-3.3</Name>211 <Private>False</Private>212 </ProjectReference>213 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">214 <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>215 <Name>HeuristicLab.Common.Resources-3.3</Name>216 <Private>False</Private>217 </ProjectReference>218 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">219 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>220 <Name>HeuristicLab.Common-3.3</Name>221 <Private>False</Private>222 </ProjectReference>223 <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">224 <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>225 <Name>HeuristicLab.Core.Views-3.3</Name>226 <Private>False</Private>227 </ProjectReference>228 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">229 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>230 <Name>HeuristicLab.Core-3.3</Name>231 <Private>False</Private>232 </ProjectReference>233 260 <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj"> 234 261 <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project> 235 262 <Name>HeuristicLab.Data.Views-3.3</Name> 236 <Private>False</Private>237 </ProjectReference>238 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">239 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>240 <Name>HeuristicLab.Data-3.3</Name>241 <Private>False</Private>242 </ProjectReference>243 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.csproj">244 <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project>245 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name>246 <Private>False</Private>247 </ProjectReference>248 <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">249 <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>250 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>251 <Private>False</Private>252 </ProjectReference>253 <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">254 <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>255 <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>256 <Private>False</Private>257 </ProjectReference>258 <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">259 <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>260 <Name>HeuristicLab.MainForm-3.3</Name>261 <Private>False</Private>262 </ProjectReference>263 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">264 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>265 <Name>HeuristicLab.Optimization-3.3</Name>266 <Private>False</Private>267 </ProjectReference>268 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">269 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>270 <Name>HeuristicLab.PluginInfrastructure-3.3</Name>271 <Private>False</Private>272 </ProjectReference>273 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">274 <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>275 <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>276 263 <Private>False</Private> 277 264 </ProjectReference> -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs
r16430 r16549 37 37 private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> foldedNodes; 38 38 private Dictionary<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode> changedNodes; 39 private Dictionary<ISymbolicExpressionTreeNode, Interval> intervals; 39 40 private Dictionary<ISymbolicExpressionTreeNode, double> nodeImpacts; 40 41 … … 194 195 progress.CanBeStopped = true; 195 196 cancellationTokenSource = new CancellationTokenSource(); 197 var interpreter = new IntervalInterpreter(); 198 196 199 var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree)); 200 var customIntervals = (Content.ProblemData as RegressionProblemData).VariableRangesParameter.Value; 201 Dictionary<String, Interval> variableRanges = new Dictionary<string, Interval>(); 202 foreach (var keyValuePair in customIntervals.VariableIntervals) { 203 variableRanges.Add(keyValuePair.Key, keyValuePair.Value); 204 } 205 var resultIntervals = await Task.Run(() => interpreter.GetSymbolicExressionTreeIntervals(tree, variableRanges, out intervals)); 197 206 try { 198 207 await Task.Delay(500, cancellationTokenSource.Token); // wait for progressbar to finish animation … … 297 306 } 298 307 if (visualTree != null) 308 visualTree.ToolTip += String.Format($"{Environment.NewLine}Intervals: [{intervals[treeNode].LowerBound:G5} ... {intervals[treeNode].UpperBound:G5}]"); 299 309 if (changedNodes.ContainsKey(treeNode)) { 300 310 visualTree.LineColor = Color.DodgerBlue; -
branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs
r16426 r16549 93 93 problemData.Parameters.Add(new FixedValueParameter<IntRange>(TestPartitionParameterName, "", (IntRange)new IntRange(0, 0).AsReadOnly())); 94 94 problemData.Parameters.Add(new ConstrainedValueParameter<StringValue>(TargetVariableParameterName, new ItemSet<StringValue>())); 95 problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName, new NamedIntervals()));95 problemData.Parameters.Add(new FixedValueParameter<NamedIntervals>(VariableRangesParameterName,"", new NamedIntervals())); 96 96 emptyProblemData = problemData; 97 97 } -
branches/2971_named_intervals/NamedIntervals.sln
r16544 r16549 22 22 EndProject 23 23 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj", "{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}" 24 EndProject 25 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj", "{7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}" 24 26 EndProject 25 27 Global … … 69 71 {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|x86.ActiveCfg = Release|x86 70 72 {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|x86.Build.0 = Release|x86 73 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 74 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|Any CPU.Build.0 = Debug|Any CPU 75 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|x64.ActiveCfg = Debug|x64 76 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|x64.Build.0 = Debug|x64 77 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|x86.ActiveCfg = Debug|x86 78 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Debug|x86.Build.0 = Debug|x86 79 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|Any CPU.ActiveCfg = Release|Any CPU 80 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|Any CPU.Build.0 = Release|Any CPU 81 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x64.ActiveCfg = Release|x64 82 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x64.Build.0 = Release|x64 83 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x86.ActiveCfg = Release|x86 84 {7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}.Release|x86.Build.0 = Release|x86 71 85 EndGlobalSection 72 86 GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset
for help on using the changeset viewer.