Changeset 18146 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate
- Timestamp:
- 12/16/21 14:23:48 (2 years ago)
- Location:
- branches/3136_Structural_GP
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3136_Structural_GP
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic
- Property svn:mergeinfo changed
-
branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs
r18075 r18146 1 1 using System; 2 using System.Collections.Generic; 2 3 using System.Linq; 3 using System.Collections.Generic;4 using HeuristicLab.Core;5 4 using HEAL.Attic; 6 5 using HeuristicLab.Common; 6 using HeuristicLab.Core; 7 7 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding; 8 8 … … 16 16 private string template; 17 17 public string Template { 18 get => template; 18 get => template; 19 19 set { 20 20 template = value; 21 21 Tree = Parser.Parse(template); 22 22 OnChanged(); 23 } 23 } 24 24 } 25 25 … … 56 56 #region Events 57 57 public event EventHandler Changed; 58 58 59 59 private void OnChanged() => Changed?.Invoke(this, EventArgs.Empty); 60 60 #endregion … … 100 100 if(!v.Arguments.SequenceEqual(subFunctionTreeNode.Arguments)) 101 101 throw new ArgumentException( 102 $"The sub-function '{v.Name}' has (at least two) different signatures " + 102 $"The sub-function '{v.Name}' has (at least two) different signatures " + 103 103 $"({v.Name}({string.Join(",", v.Arguments)}) <> {subFunctionTreeNode.Name}({string.Join(",", subFunctionTreeNode.Arguments)}))."); 104 104 } else { … … 125 125 var mulNode = mul.CreateTreeNode(); 126 126 127 var c1 = new Constant();128 var c1Node = (ConstantTreeNode)c1.CreateTreeNode();129 c1Node.Value = 0.0;130 var c2 = new Constant();131 var c2Node = (ConstantTreeNode)c2.CreateTreeNode();132 c2Node.Value = 1.0;133 134 addNode.AddSubtree( c1Node);127 var offset = new Number(); 128 var offsetNode = (NumberTreeNode)offset.CreateTreeNode(); 129 offsetNode.Value = 0.0; 130 var scale = new Number(); 131 var scaleNode = (NumberTreeNode)scale.CreateTreeNode(); 132 scaleNode.Value = 1.0; 133 134 addNode.AddSubtree(offsetNode); 135 135 addNode.AddSubtree(mulNode); 136 mulNode.AddSubtree( c2Node);137 136 mulNode.AddSubtree(scaleNode); 137 138 138 startNode.RemoveSubtree(0); 139 139 startNode.AddSubtree(addNode);
Note: See TracChangeset
for help on using the changeset viewer.