Changeset 17130

Timestamp:

07/11/19 12:41:55 (5 years ago)

Author:

gkronber

Message:

#2994: merged r17121:17128 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Access.Administration (modified) (1 prop)
• HeuristicLab.Clients.Access.Administration/3.3/Views/PasswordDisplayDialog.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/CheckedItemListView.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs (modified) (1 diff)
• HeuristicLab.Tests (modified) (1 prop)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs (modified) (1 diff)

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Access.Administration/3.3/Views/PasswordDisplayDialog.Designer.cs

@@ -76 +76 @@
       this.passwordTextbox.Location = new System.Drawing.Point(102, 6);
       this.passwordTextbox.Name = "passwordTextbox";
+      this.passwordTextbox.ReadOnly = true;
       this.passwordTextbox.Size = new System.Drawing.Size(203, 20);
       this.passwordTextbox.TabIndex = 2;

branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/CheckedItemCollectionView.cs

@@ -84 +84 @@
       if (doubleClick) {
         e.NewValue = e.CurrentValue;
-        doubleClick = false;
       } else {
         bool check = e.NewValue == CheckState.Checked;
@@ -104 +103 @@
     }
     protected void itemsListView_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Clicks > 1)
-        doubleClick = true;
+      doubleClick = e.Clicks > 1;
     }
     #endregion

branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/CheckedItemListView.cs

@@ -86 +86 @@
       if (doubleClick) {
         e.NewValue = e.CurrentValue;
-        doubleClick = false;
       } else {
         bool check = e.NewValue == CheckState.Checked;
@@ -107 +106 @@
 
     protected void itemsListView_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e) {
-      if (e.Clicks > 1)
-        doubleClick = true;
+      doubleClick = e.Clicks > 1;
     }
 

branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -248 +248 @@
           Clipboard.SetText(builder.ToString());
         }
+      } else if (itemsListView.MultiSelect && e.KeyData == (Keys.A | Keys.Control)) {
+        try {
+          itemsListView.BeginUpdate();
+          foreach (ListViewItem item in itemsListView.Items)
+            item.Selected = true;
+        } finally { itemsListView.EndUpdate(); }
       }
     }

branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -269 +269 @@
           Clipboard.SetText(builder.ToString());
         }
+      } else if (itemsListView.MultiSelect && e.KeyData == (Keys.A | Keys.Control)) {
+        try {
+          itemsListView.BeginUpdate();
+          foreach (ListViewItem item in itemsListView.Items)
+            item.Selected = true;
+        } finally { itemsListView.EndUpdate(); }
       }
     }

branches/2994-AutoDiffForIntervals/HeuristicLab.DataPreprocessing/3.4/PreprocessingContext.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -32 +32 @@
   [StorableType("52D31B2B-7D48-482B-B875-5FCE0F8397A8")]
   public class PreprocessingContext : NamedItem {
-    public string Filename { get; set; }
 
     [Storable]

branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs

@@ -179 +179 @@
         var u = (ISymbolicExpressionTreeNode)branch.GetSubtree(0).Clone();
         return Div(fxp, Square(Cosine(u)));
+      }
+      if (branch.Symbol is HyperbolicTangent) {
+        // tanh(f(x))' = f(x)'sech²(f(x)) = f(x)'(1 - tanh²(f(x)))
+        var fxp = Derive(branch.GetSubtree(0), variableName);
+        var tanh = (ISymbolicExpressionTreeNode)branch.Clone();
+        return Product(fxp, Subtract(CreateConstant(1.0), Square(tanh)));
       }
       throw new NotSupportedException(string.Format("Symbol {0} is not supported.", branch.Symbol));

branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs

@@ -68 +68 @@
 
       Assert.AreEqual("('a' * 'b' * 'c')", Derive("a*b*c*d", "d"));
-      Assert.AreEqual("('a' / ('b' * 'c' * SQR('d') * (-1)))", Derive("a/b/c/d", "d")); 
+      Assert.AreEqual("('a' / ('b' * 'c' * SQR('d') * (-1)))", Derive("a/b/c/d", "d"));
+
+      Assert.AreEqual("('x' * ((SQR(TANH(SQR('x'))) * (-1)) + 1) * 2)", Derive("tanh(sqr(x))", "x")); // (2*'x'*(1 - SQR(TANH(SQR('x'))))
 
       {