Merge pull request #47 from SpiceSharp/development

Implement IRuleSubject for sources

Author: svenboulanger

SpiceSharpBehavioral/Components/BehavioralSources/BehavioralCurrentSource/BehavioralCurrentSource.cs

@@ -1,14 +1,16 @@
 using SpiceSharp.Components.BehavioralComponents;
 using SpiceSharp.Attributes;
+using SpiceSharp.Validation;
+using System.Linq;
 
 namespace SpiceSharp.Components
 {
     /// <summary>
     /// A behavioral current source.
     /// </summary>
     /// <seealso cref="BehavioralComponent" />
-    [Pin(0, "I+"), Pin(1, "I-"), Connected]
-    public class BehavioralCurrentSource : BehavioralComponent
+    [Pin(0, "I+"), Pin(1, "I-"), IndependentSource, Connected]
+    public class BehavioralCurrentSource : BehavioralComponent, IRuleSubject
     {
         /// <summary>
         /// The behavioral current source base pin count
@@ -37,5 +39,14 @@ public BehavioralCurrentSource(string name, string pos, string neg, string expre
             Connect(pos, neg);
             Parameters.Expression = expression;
         }
+
+        /// <inheritdoc/>
+        void IRuleSubject.Apply(IRules rules)
+        {
+            var p = rules.GetParameterSet<ComponentRuleParameters>();
+            var nodes = Nodes.Select(name => p.Factory.GetSharedVariable(name)).ToArray();
+            foreach (var rule in rules.GetRules<IConductiveRule>())
+                rule.AddPath(this, ConductionTypes.None, nodes[0], nodes[1]);
+        }
     }
 }

SpiceSharpBehavioral/Components/BehavioralSources/BehavioralVoltageSource/BehavioralVoltageSource.cs

@@ -1,12 +1,16 @@
-using SpiceSharp.Components.BehavioralComponents;
+using SpiceSharp.Attributes;
+using SpiceSharp.Components.BehavioralComponents;
+using SpiceSharp.Validation;
+using System.Linq;
 
 namespace SpiceSharp.Components
 {
     /// <summary>
     /// A behavioral voltage source.
     /// </summary>
     /// <seealso cref="BehavioralComponent" />
-    public class BehavioralVoltageSource : BehavioralComponent
+    [Pin(0, "V+"), Pin(1, "V-"), VoltageDriver(0, 1), IndependentSource]
+    public class BehavioralVoltageSource : BehavioralComponent, IRuleSubject
     {
         /// <summary>
         /// The behavioral voltage source base pin count
@@ -35,5 +39,16 @@ public BehavioralVoltageSource(string name, string pos, string neg, string expre
             Connect(pos, neg);
             Parameters.Expression = expression;
         }
+
+        /// <inheritdoc/>
+        void IRuleSubject.Apply(IRules rules)
+        {
+            var p = rules.GetParameterSet<ComponentRuleParameters>();
+            var nodes = Nodes.Select(name => p.Factory.GetSharedVariable(name)).ToArray();
+            foreach (var rule in rules.GetRules<IConductiveRule>())
+                rule.AddPath(this, nodes[0], nodes[1]);
+            foreach (var rule in rules.GetRules<IAppliedVoltageRule>())
+                rule.Fix(this, nodes[0], nodes[1]);
+        }
     }
 }

SpiceSharpBehavioral/SpiceSharpBehavioral.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard1.5;netstandard2.0;net45;netcoreapp2.1</TargetFrameworks>
-    <Version>3.0.5</Version>
+    <Version>3.0.6</Version>
     <Authors>Sven Boulanger</Authors>
 	  <Title>Spice#.Behavioral</Title>
     <Description>Spice#.Behavioral is a library that allows using behavioral components in the circuit simulator Spice#.</Description>
@@ -11,12 +11,12 @@
     <RepositoryUrl>https://github.com/SpiceSharp/SpiceSharpBehavioral</RepositoryUrl>
     <PackageTags>circuit electronics netlist parser spice simulator simulation ode solver design behavioral modeling</PackageTags>
     <PackageIconUrl></PackageIconUrl>
-    <AssemblyVersion>3.0.5.0</AssemblyVersion>
+    <AssemblyVersion>3.0.6.0</AssemblyVersion>
     <PackageReleaseNotes>Refer to the GitHub release for release notes.</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Company />
     <NeutralLanguage>en</NeutralLanguage>
-    <FileVersion>3.0.5.0</FileVersion>
+    <FileVersion>3.0.6.0</FileVersion>
     <DebugType>full</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -67,7 +67,7 @@
 
   <ItemGroup>
 	<PackageReference Include="SpiceSharp">
-	  <Version>3.0.4</Version>
+	  <Version>3.0.5</Version>
 	</PackageReference>
 	<PackageReference Include="System.Reflection.Emit.Lightweight">
 	  <Version>4.7.0</Version>

SpiceSharpBehavioralTest/Components/BehavioralCurrentSourceTests.cs

@@ -66,6 +66,23 @@ public void When_UsedAsImpedanceOp_Expect_Reference(string expression, double dc
             op.Run(ckt);
         }
 
+        [Test]
+        public void When_DifferentialVoltage_Expect_Reference()
+        {
+            var ckt = new Circuit(
+                new VoltageSource("V1", "a", "0", new Sine(0, 1, 100)),
+                new VoltageSource("V2", "b", "0", new Sine(0, 2, 65)),
+                new BehavioralCurrentSource("I1", "0", "out", "V(a,b)/2"),
+                new Resistor("R1", "out", "0", 1));
+
+            var tran = new Transient("tran", 1e-6, 1e-3);
+            tran.ExportSimulationData += (sender, args) =>
+            {
+                Assert.AreEqual(0.5 * (args.GetVoltage("a") - args.GetVoltage("b")), args.GetVoltage("out"), 1e-12);
+            };
+            tran.Run(ckt);
+        }
+
         [Test]
         public void When_CapacitorTransient_Expect_Reference()
         {

SpiceSharpBehavioralTest/SpiceSharpBehavioralTest.csproj

@@ -75,10 +75,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="SpiceSharp">
-      <Version>3.0.4</Version>
+      <Version>3.0.5</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
-      <Version>3.13.0</Version>
+      <Version>3.13.1</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Console">
       <Version>3.12.0</Version>