- Timestamp:
- 07/11/19 12:41:55 (5 years ago)
- Location:
- branches/2994-AutoDiffForIntervals
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2994-AutoDiffForIntervals
- Property svn:mergeinfo changed
/trunk merged: 17121,17125-17128
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Access.Administration
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Clients.Access.Administration (added) merged: 17121
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Access.Administration/3.3/Views/PasswordDisplayDialog.Designer.cs
r16565 r17130 76 76 this.passwordTextbox.Location = new System.Drawing.Point(102, 6); 77 77 this.passwordTextbox.Name = "passwordTextbox"; 78 this.passwordTextbox.ReadOnly = true; 78 79 this.passwordTextbox.Size = new System.Drawing.Size(203, 20); 79 80 this.passwordTextbox.TabIndex = 2; -
branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Core.Views merged: 17126-17127
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs
r17120 r17130 84 84 if (doubleClick) { 85 85 e.NewValue = e.CurrentValue; 86 doubleClick = false;87 86 } else { 88 87 bool check = e.NewValue == CheckState.Checked; … … 104 103 } 105 104 protected void itemsListView_MouseDown(object sender, MouseEventArgs e) { 106 if (e.Clicks > 1) 107 doubleClick = true; 105 doubleClick = e.Clicks > 1; 108 106 } 109 107 #endregion -
branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs
r17120 r17130 86 86 if (doubleClick) { 87 87 e.NewValue = e.CurrentValue; 88 doubleClick = false;89 88 } else { 90 89 bool check = e.NewValue == CheckState.Checked; … … 107 106 108 107 protected void itemsListView_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) { 109 if (e.Clicks > 1) 110 doubleClick = true; 108 doubleClick = e.Clicks > 1; 111 109 } 112 110 -
branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs
r17120 r17130 248 248 Clipboard.SetText(builder.ToString()); 249 249 } 250 } else if (itemsListView.MultiSelect && e.KeyData == (Keys.A | Keys.Control)) { 251 try { 252 itemsListView.BeginUpdate(); 253 foreach (ListViewItem item in itemsListView.Items) 254 item.Selected = true; 255 } finally { itemsListView.EndUpdate(); } 250 256 } 251 257 } -
branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/ItemListView.cs
r17120 r17130 269 269 Clipboard.SetText(builder.ToString()); 270 270 } 271 } else if (itemsListView.MultiSelect && e.KeyData == (Keys.A | Keys.Control)) { 272 try { 273 itemsListView.BeginUpdate(); 274 foreach (ListViewItem item in itemsListView.Items) 275 item.Selected = true; 276 } finally { itemsListView.EndUpdate(); } 271 277 } 272 278 } -
branches/2994-AutoDiffForIntervals/HeuristicLab.DataPreprocessing
- Property svn:mergeinfo changed
/trunk/HeuristicLab.DataPreprocessing merged: 17128
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
/trunk/HeuristicLab.DataPreprocessing/3.4 merged: 17128
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs
r17120 r17130 22 22 using System; 23 23 using System.Collections.Generic; 24 using HEAL.Attic; 24 25 using HeuristicLab.Common; 25 26 using HeuristicLab.Core; 26 27 using HeuristicLab.Optimization; 27 using HEAL.Attic;28 28 using HeuristicLab.Problems.DataAnalysis; 29 29 … … 32 32 [StorableType("52D31B2B-7D48-482B-B875-5FCE0F8397A8")] 33 33 public class PreprocessingContext : NamedItem { 34 public string Filename { get; set; }35 34 36 35 [Storable] -
branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic merged: 17125
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs
r16911 r17130 179 179 var u = (ISymbolicExpressionTreeNode)branch.GetSubtree(0).Clone(); 180 180 return Div(fxp, Square(Cosine(u))); 181 } 182 if (branch.Symbol is HyperbolicTangent) { 183 // tanh(f(x))' = f(x)'sech²(f(x)) = f(x)'(1 - tanh²(f(x))) 184 var fxp = Derive(branch.GetSubtree(0), variableName); 185 var tanh = (ISymbolicExpressionTreeNode)branch.Clone(); 186 return Product(fxp, Subtract(CreateConstant(1.0), Square(tanh))); 181 187 } 182 188 throw new NotSupportedException(string.Format("Symbol {0} is not supported.", branch.Symbol)); -
branches/2994-AutoDiffForIntervals/HeuristicLab.Tests
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Tests merged: 17125
- Property svn:mergeinfo changed
-
branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs
r16739 r17130 68 68 69 69 Assert.AreEqual("('a' * 'b' * 'c')", Derive("a*b*c*d", "d")); 70 Assert.AreEqual("('a' / ('b' * 'c' * SQR('d') * (-1)))", Derive("a/b/c/d", "d")); 70 Assert.AreEqual("('a' / ('b' * 'c' * SQR('d') * (-1)))", Derive("a/b/c/d", "d")); 71 72 Assert.AreEqual("('x' * ((SQR(TANH(SQR('x'))) * (-1)) + 1) * 2)", Derive("tanh(sqr(x))", "x")); // (2*'x'*(1 - SQR(TANH(SQR('x')))) 71 73 72 74 {
Note: See TracChangeset
for help on using the changeset viewer.