Changeset 8915 for branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Timestamp:
- 11/15/12 16:47:25 (12 years ago)
- Location:
- branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r8409 r8915 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="ALGLIB-3.5.0"> 96 <HintPath>..\..\..\..\Trunk\sources\bin\ALGLIB-3.5.0.dll</HintPath> 95 <Reference Include="ALGLIB-3.6.0, Version=3.6.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 96 <SpecificVersion>False</SpecificVersion> 97 <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.6.0.dll</HintPath> 98 <Private>False</Private> 97 99 </Reference> 98 100 <Reference Include="HeuristicLab.Collections-3.3"> 99 101 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath> 102 <Private>False</Private> 100 103 </Reference> 101 104 <Reference Include="HeuristicLab.Common-3.3"> 102 105 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath> 106 <Private>False</Private> 103 107 </Reference> 104 108 <Reference Include="HeuristicLab.Common.Resources-3.3"> 105 109 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath> 110 <Private>False</Private> 106 111 </Reference> 107 112 <Reference Include="HeuristicLab.Core-3.3"> 108 113 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath> 114 <Private>False</Private> 109 115 </Reference> 110 116 <Reference Include="HeuristicLab.Core.Views-3.3"> 111 117 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath> 118 <Private>False</Private> 112 119 </Reference> 113 120 <Reference Include="HeuristicLab.Data-3.3"> 114 121 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath> 122 <Private>False</Private> 115 123 </Reference> 116 124 <Reference Include="HeuristicLab.Data.Views-3.3"> 117 125 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath> 126 <Private>False</Private> 118 127 </Reference> 119 128 <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4"> 120 129 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath> 130 <Private>False</Private> 121 131 </Reference> 122 132 <Reference Include="HeuristicLab.MainForm-3.3"> 123 133 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath> 134 <Private>False</Private> 124 135 </Reference> 125 136 <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3"> 126 137 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath> 138 <Private>False</Private> 127 139 </Reference> 128 140 <Reference Include="HeuristicLab.Operators-3.3"> 129 141 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath> 142 <Private>False</Private> 130 143 </Reference> 131 144 <Reference Include="HeuristicLab.Optimization-3.3"> 132 145 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath> 146 <Private>False</Private> 133 147 </Reference> 134 148 <Reference Include="HeuristicLab.Optimization.Views-3.3"> 135 149 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath> 150 <Private>False</Private> 136 151 </Reference> 137 152 <Reference Include="HeuristicLab.Parameters-3.3"> 138 153 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath> 154 <Private>False</Private> 139 155 </Reference> 140 156 <Reference Include="HeuristicLab.Persistence-3.3"> 141 157 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath> 158 <Private>False</Private> 142 159 </Reference> 143 160 <Reference Include="HeuristicLab.PluginInfrastructure-3.3"> 144 161 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath> 162 <Private>False</Private> 145 163 </Reference> 146 164 <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4"> 147 165 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath> 166 <Private>False</Private> 148 167 </Reference> 149 168 <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3"> 150 169 <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath> 170 <Private>False</Private> 151 171 </Reference> 152 172 <Reference Include="System" /> … … 255 275 <Project>{423BD94F-963A-438E-BA45-3BB3D61CD03B}</Project> 256 276 <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4</Name> 277 <Private>False</Private> 257 278 </ProjectReference> 258 279 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj"> … … 293 314 --> 294 315 <PropertyGroup> 295 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)316 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 296 317 set ProjectDir=$(ProjectDir) 297 318 set SolutionDir=$(SolutionDir) … … 300 321 call PreBuildEvent.cmd 301 322 </PreBuildEvent> 323 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 324 export ProjectDir=$(ProjectDir) 325 export SolutionDir=$(SolutionDir) 326 327 $SolutionDir/PreBuildEvent.sh 328 </PreBuildEvent> 302 329 </PropertyGroup> 303 330 </Project> -
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs
r8409 r8915 172 172 this.treeChart.SymbolicExpressionTreeChanged += new System.EventHandler(this.treeChart_SymbolicExpressionTreeChanged); 173 173 this.treeChart.SymbolicExpressionTreeNodeChanged += new System.EventHandler(this.treeChart_SymbolicExpressionTreeNodeChanged); 174 this.treeChart.SymbolicExpressionTreeNodeInserted += new System.EventHandler(this.treeChart_SymbolicExpressionTreeNodeInserted);175 174 this.treeChart.SymbolicExpressionTreeNodeClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeClicked); 176 175 this.treeChart.SymbolicExpressionTreeNodeDoubleClicked += new System.Windows.Forms.MouseEventHandler(this.treeChart_SymbolicExpressionTreeNodeDoubleClicked); -
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs
r8409 r8915 147 147 148 148 public event EventHandler SymbolicExpressionTreeNodeChanged; 149 public event EventHandler SymbolicExpressionTreeNodeInserted;150 149 151 150 private void OnChangeValueDialogValidated(object sender, EventArgs e) { -
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Plugin.cs.frame
r8246 r8915 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginFile("displayModelFrame.html", PluginFileType.Data)] 31 [PluginDependency("HeuristicLab.ALGLIB", "3. 5")]31 [PluginDependency("HeuristicLab.ALGLIB", "3.6.0")] 32 32 [PluginDependency("HeuristicLab.Collections", "3.3")] 33 33 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableConditionView.cs
r8103 r8915 124 124 RegisterVariableNamesViewContentEvents(); 125 125 } else { 126 var existingEntries = variableNamesView.Content.ToList();127 128 126 // temporarily deregister to prevent circular calling of events 129 127 DeregisterVariableNamesViewContentEvents(); 130 // add additional entries 131 foreach (var variableName in Content.VariableNames.Except(existingEntries.Select(x => x.Value))) 132 variableNamesView.Content.Add(new StringValue(variableName), true); 133 foreach (var oldEntry in existingEntries.Where(x => !Content.VariableNames.Contains(x.Value))) 134 variableNamesView.Content.Remove(oldEntry); 128 variableNamesView.Content.Clear(); 129 foreach (var variableName in Content.AllVariableNames) { 130 variableNamesView.Content.Add(new StringValue(variableName), Content.VariableNames.Contains(variableName)); 131 } 135 132 RegisterVariableNamesViewContentEvents(); 136 133 -
branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/Symbols/VariableView.cs
r8103 r8915 92 92 protected override void SetEnabledStateOfControls() { 93 93 base.SetEnabledStateOfControls(); 94 enabledCheckBox.Enabled = Content != null && Content.VariableNames.Any() && !Locked && !ReadOnly; 94 95 weightInitializationMuTextBox.Enabled = Content != null; 95 96 weightInitializationMuTextBox.ReadOnly = ReadOnly; … … 180 181 RegisterVariableNamesViewContentEvents(); 181 182 } else { 182 var existingEntries = variableNamesView.Content.ToList();183 184 183 // temporarily deregister to prevent circular calling of events 185 184 DeregisterVariableNamesViewContentEvents(); 186 // add additional entries 187 foreach (var variableName in Content.VariableNames.Except(existingEntries.Select(x => x.Value))) 188 variableNamesView.Content.Add(new StringValue(variableName), true); 189 foreach (var oldEntry in existingEntries.Where(x => !Content.VariableNames.Contains(x.Value))) 190 variableNamesView.Content.Remove(oldEntry); 185 variableNamesView.Content.Clear(); 186 foreach (var variableName in Content.AllVariableNames) { 187 variableNamesView.Content.Add(new StringValue(variableName), Content.VariableNames.Contains(variableName)); 188 } 191 189 RegisterVariableNamesViewContentEvents(); 192 190
Note: See TracChangeset
for help on using the changeset viewer.