Refactor

Author: svenboulanger

SpiceSharpBehavioral/Builders/Direct/ComplexBuilder.cs

@@ -1,8 +1,6 @@
 using SpiceSharp;
-using SpiceSharp.Simulations;
 using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
-using System.Collections.Generic;
 using System.Numerics;
 
 namespace SpiceSharpBehavioral.Builders.Direct

SpiceSharpBehavioral/Builders/Functions.cs

@@ -1,5 +1,4 @@
-using SpiceSharp;
-using System;
+using System;
 using System.Numerics;
 
 namespace SpiceSharpBehavioral.Builders

SpiceSharpBehavioral/Builders/Functions/ComplexFunctionBuilder.cs

@@ -1,7 +1,5 @@
-using SpiceSharp.Simulations;
-using SpiceSharpBehavioral.Parsers.Nodes;
+using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
-using System.Collections.Generic;
 using System.Numerics;
 
 namespace SpiceSharpBehavioral.Builders.Functions

SpiceSharpBehavioral/Builders/Functions/ComplexFunctionBuilderHelper.cs

@@ -1,5 +1,4 @@
 using SpiceSharp;
-using SpiceSharpBehavioral.Builders.Direct;
 using SpiceSharpBehavioral.Diagnostics;
 using SpiceSharpBehavioral.Parsers.Nodes;
 using System;

SpiceSharpBehavioral/Builders/Functions/FunctionFoundEventArgs.cs

@@ -1,7 +1,6 @@
 using SpiceSharp;
 using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
-using System.Collections.Generic;
 
 namespace SpiceSharpBehavioral.Builders.Functions
 {

SpiceSharpBehavioral/Builders/Functions/RealFunctionBuilder.cs

@@ -1,7 +1,5 @@
-using SpiceSharp.Simulations;
-using SpiceSharpBehavioral.Parsers.Nodes;
+using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
-using System.Collections.Generic;
 
 namespace SpiceSharpBehavioral.Builders.Functions
 {

SpiceSharpBehavioral/Builders/Functions/RealILState.cs

@@ -1,8 +1,6 @@
 using SpiceSharp;
-using SpiceSharpBehavioral.Diagnostics;
 using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Reflection.Emit;
 

…l/Components/BehavioralBindingContext.cs …ioralSources/BehavioralBindingContext.csSpiceSharpBehavioral/Components/BehavioralBindingContext.cs renamed to SpiceSharpBehavioral/Components/BehavioralSources/BehavioralBindingContext.cs SpiceSharpBehavioral/Components/BehavioralBindingContext.cs renamed to SpiceSharpBehavioral/Components/BehavioralSources/BehavioralBindingContext.cs

@@ -1,17 +1,16 @@
-using SpiceSharp.Algebra;
-using SpiceSharp.Attributes;
+using SpiceSharp.Attributes;
 using SpiceSharp.Behaviors;
-using SpiceSharp.Components.CommonBehaviors;
 using SpiceSharp.Simulations;
 using SpiceSharpBehavioral;
 using SpiceSharpBehavioral.Builders;
+using SpiceSharpBehavioral.Builders.Functions;
 using SpiceSharpBehavioral.Parsers.Nodes;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Numerics;
 
-namespace SpiceSharp.Components.BehavioralComponents
+namespace SpiceSharp.Components.BehavioralSources
 {
     /// <summary>
     /// A context for behavioral components.
@@ -67,7 +66,8 @@ public Dictionary<VariableNode, Node> CreateDerivatives(Node function)
         /// <param name="factory">The factory for variables.</param>
         /// <param name="function">The function containing the variables.</param>
         /// <param name="ownBranch">Optionally a branch for the current behavior branch current.</param>
-        public Dictionary<VariableNode, IVariable<T>> MapNodes<T>(IVariableFactory<IVariable<T>> factory, Node function, IVariable<T> ownBranch = null)
+        /// <returns>The variables by their nodes.</returns>
+        public Dictionary<VariableNode, IVariable<T>> GetVariableNodes<T>(IVariableFactory<IVariable<T>> factory, Node function, IVariable<T> ownBranch = null)
         {
             var state = GetState<IBiasingSimulationState>();
             var bp = GetParameterSet<Parameters>();
@@ -78,11 +78,44 @@ public Dictionary<VariableNode, IVariable<T>> MapNodes<T>(IVariableFactory<IVari
             foreach (var variable in nf.Build(function).Where(v => v.NodeType == NodeTypes.Voltage || v.NodeType == NodeTypes.Current))
             {
                 if (!variables.ContainsKey(variable))
-                    variables.Add(variable, MapNode(factory, variable, ownBranch));
+                    variables.Add(variable, GetVariableNode(factory, variable, ownBranch));
             }
             return variables;
         }
 
+        /// <summary>
+        /// Maps all the nodes that are referenced in the function and makes them discoverable by the function builder.
+        /// </summary>
+        /// <typeparam name="T">The variable value type.</typeparam>
+        /// <param name="factory">The factory for variables.</param>
+        /// <param name="function">The function containing the variables.</param>
+        /// <param name="builder">The function builder.</param>
+        /// <param name="ownBranch">Optionally, a branch for the current behavior branch current.</param>
+        /// <returns>The variables by their nodes.</returns>
+        public Dictionary<VariableNode, IVariable<T>> MapVariableNodes<T>(IVariableFactory<IVariable<T>> factory, Node function, IFunctionBuilder<T> builder, IVariable<T> ownBranch = null)
+        {
+            var variables = GetVariableNodes(factory, function, ownBranch);
+            MapVariableNodes(variables, builder);
+            return variables;
+        }
+
+        /// <summary>
+        /// Maps the nodes in the dictionary such that they are discoverable by the function builder.
+        /// </summary>
+        /// <typeparam name="T">The variable value type.</typeparam>
+        /// <param name="variables">The dictionary of variables.</param>
+        /// <param name="builder">The function builder.</param>
+        public void MapVariableNodes<T>(Dictionary<VariableNode, IVariable<T>> variables, IFunctionBuilder<T> builder)
+        {
+            builder.VariableFound += (sender, args) =>
+            {
+                if (args.Variable != null)
+                    return; // Already found
+                if (variables.TryGetValue(args.Node, out var value))
+                    args.Variable = value;
+            };
+        }
+
         /// <summary>
         /// Remap a variable node to an <see cref="IVariable{T}"/>.
         /// </summary>
@@ -91,7 +124,7 @@ public Dictionary<VariableNode, IVariable<T>> MapNodes<T>(IVariableFactory<IVari
         /// <param name="node">The node.</param>
         /// <param name="ownBranch">The branch.</param>
         /// <returns>The variable.</returns>
-        public IVariable<T> MapNode<T>(IVariableFactory<IVariable<T>> factory, VariableNode node, IVariable<T> ownBranch = null)
+        public IVariable<T> GetVariableNode<T>(IVariableFactory<IVariable<T>> factory, VariableNode node, IVariable<T> ownBranch = null)
         {
             switch (node.NodeType)
             {
@@ -145,5 +178,21 @@ public IVariable<T> MapNode<T>(IVariableFactory<IVariable<T>> factory, VariableN
                     throw new SpiceSharpException($"Could not determine the variable {node.Name}");
             }
         }
+
+        /// <summary>
+        /// Converts any variables in a dictionary for a complex behavior that wishes to reuse it.
+        /// </summary>
+        /// <param name="variables">The variables.</param>
+        /// <param name="builder">The complex function builder.</param>
+        public void ConvertVariables(IReadOnlyDictionary<VariableNode, IVariable<double>> variables, IFunctionBuilder<Complex> builder)
+        {
+            builder.VariableFound += (sender, args) =>
+            {
+                if (args.Variable != null)
+                    return; // Already found
+                if (variables.TryGetValue(args.Node, out var value))
+                    args.Variable = new FuncVariable<Complex>(value.Name, () => value.Value, value.Unit);
+            };
+        }
     }
 }

SpiceSharpBehavioral/Components/BehavioralSources/BehavioralCapacitor/BehavioralCapacitor.cs

@@ -1,5 +1,5 @@
 using SpiceSharp.Attributes;
-using SpiceSharp.Components.BehavioralComponents;
+using SpiceSharp.Components.BehavioralSources;
 using SpiceSharp.Validation;
 using System.Linq;
 

SpiceSharpBehavioral/Components/BehavioralSources/BehavioralCapacitor/Biasing.cs

@@ -1,5 +1,5 @@
 using SpiceSharp.Behaviors;
-using SpiceSharp.Components.BehavioralComponents;
+using SpiceSharp.Components.BehavioralSources;
 using SpiceSharp.Components.CommonBehaviors;
 using SpiceSharp.Simulations;
 using SpiceSharpBehavioral.Builders;
@@ -59,7 +59,7 @@ public Biasing(BehavioralBindingContext context)
             };
             Function = replacer.Build(bp.Function);
             Derivatives = context.CreateDerivatives(Function);
-            VariableNodes = context.MapNodes(state, Function);
+            VariableNodes = context.GetVariableNodes(state, Function);
         }
     }
 }