Use latest SpiceSharp

SpiceSharp · Oct 11, 2024 · b1e9b9c · b1e9b9c
1 parent 26abcc5
commit b1e9b9c
Show file tree

Hide file tree

Showing 24 changed files with 188 additions and 32 deletions.
diff --git a/src/SpiceSharpParser.CodeAnalysis/SpiceSharpParser.CodeAnalysis.csproj b/src/SpiceSharpParser.CodeAnalysis/SpiceSharpParser.CodeAnalysis.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageReference Include="SpiceSharp" Version="3.2.2" />
+    <PackageReference Include="SpiceSharp" Version="3.2.3" />
     <PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/SpiceSharpParser.IntegrationTests/BaseTests.cs b/src/SpiceSharpParser.IntegrationTests/BaseTests.cs
@@ -290,7 +290,7 @@ public static Tuple<double, double>[] RunDCSimulation(SpiceSharpModel readerResu
                 list.Add(new Tuple<double, double>(((DC)simulation).GetCurrentSweepValue().Last(), export.Extract()));
             };
 
-            var codes = simulation.Run(readerResult.Circuit);
+            var codes = simulation.Run(readerResult.Circuit, -1);
             var attached = simulation.AttachEvents(codes);
             attached.ToArray(); // eval
 

diff --git a/src/SpiceSharpParser.IntegrationTests/Common/CaseSensitivityTests.cs b/src/SpiceSharpParser.IntegrationTests/Common/CaseSensitivityTests.cs
@@ -1,7 +1,9 @@
+using SpiceSharp.Simulations;
 using SpiceSharpParser.Common;
 using SpiceSharpParser.ModelReaders.Netlist.Spice;
 using System;
 using System.IO;
+using System.Linq;
 using System.Text;
 using Xunit;
 
@@ -129,7 +131,10 @@ public void When_DistributionNameSensitive_Positive_Expect_NoException()
             reader.Settings.CaseSensitivity.IsDistributionNameCaseSensitive = true;
             var spiceModel = reader.Read(parseResult.FinalModel);
 
-            spiceModel.Simulations[0].Run(spiceModel.Circuit);
+            var codes = spiceModel.Simulations[0].Run(spiceModel.Circuit, -1);
+            codes = spiceModel.Simulations[0].AttachEvents(codes);
+
+            codes.ToArray();
         }
 
         [Fact]
@@ -153,8 +158,11 @@ public void When_DistributionNameSensitive_Negative_Expect_Exception()
             reader.Settings.CaseSensitivity.IsDistributionNameCaseSensitive = true;
             var spiceModel = reader.Read(parseResult.FinalModel);
 
-            Assert.Throws<ArgumentException>(() =>
-                spiceModel.Simulations[0].Run(spiceModel.Circuit));
+            var codes = spiceModel.Simulations[0].Run(spiceModel.Circuit, -1);
+            codes = spiceModel.Simulations[0].AttachEvents(codes);
+
+
+            Assert.Throws<ArgumentException>(() => codes.ToArray());
         }
 
         [Fact]
@@ -179,7 +187,7 @@ public void BuiltInFunctionNamePositive()
             reader.Settings.CaseSensitivity.IsDistributionNameCaseSensitive = true;
             var spiceModel = reader.Read(parseResult.FinalModel);
 
-            var exception = Record.Exception(() => spiceModel.Simulations[0].Run(spiceModel.Circuit));
+            var exception = Record.Exception(() => spiceModel.Simulations[0].Run(spiceModel.Circuit).ToArray());
             Assert.Null(exception);
 
         }
@@ -291,7 +299,7 @@ public void ComponentNamesException()
             reader.Settings.CaseSensitivity.IsEntityNamesCaseSensitive = true;
             var spiceModel = reader.Read(parseResult.FinalModel);
 
-            Assert.Throws<SpiceSharp.BehaviorsNotFoundException>(() => RunOpSimulation(spiceModel, "I(r1)"));
+            Assert.Throws<SpiceSharpParserException>(() => RunOpSimulation(spiceModel, "I(r1)"));
         }
 
         [Fact]

diff --git a/src/SpiceSharpParser.IntegrationTests/DotStatements/PrintTests.cs b/src/SpiceSharpParser.IntegrationTests/DotStatements/PrintTests.cs
@@ -14,14 +14,13 @@ public void When_InvalidExportForSimulationWithoutFilter_Expect_Reference()
                 "R1 IN OUT 10e3",
                 "C1 OUT 0 10e-6",
                 ".OP",
-                ".PRINT V(OUT) I(C1)",
+                ".PRINT V(OUT)",
                 ".END");
             RunSimulations(model);
 
             Assert.Single(model.Prints);
             Assert.Equal("#1 OP", model.Prints[0].Name);
             Assert.Single(model.Prints[0].ColumnNames);
-            Assert.Single(model.Prints[0].Rows[0].Columns);
             Assert.Single(model.Prints[0].Rows);
         }
 
@@ -117,7 +116,7 @@ public void When_PrintOpWithoutFilterWithoutParameters_Expect_Reference()
             RunSimulations(model);
             Assert.Single(model.Prints);
             Assert.Equal("#1 OP", model.Prints[0].Name);
-            Assert.Equal(6, model.Prints[0].ColumnNames.Count);
+            Assert.Equal(5, model.Prints[0].ColumnNames.Count);
             Assert.Single(model.Prints[0].Rows);
         }
 
@@ -157,15 +156,13 @@ public void When_PrintOpWithoutArgumentsWithoutFilter_Expect_Reference()
 
             Assert.Single( model.Prints);
             Assert.Equal("#1 OP", model.Prints[0].Name);
-            Assert.Equal(6, model.Prints[0].ColumnNames.Count);
+            Assert.Equal(5, model.Prints[0].ColumnNames.Count);
 
             Assert.Equal("I(V1)", model.Prints[0].ColumnNames[0]);
             Assert.Equal("I(R1)", model.Prints[0].ColumnNames[1]);
-            Assert.Equal("I(C1)", model.Prints[0].ColumnNames[2]);
-            Assert.Equal("V(IN)", model.Prints[0].ColumnNames[3]);
-            Assert.Equal("V(0)", model.Prints[0].ColumnNames[4]);
-            Assert.Equal("V(OUT)", model.Prints[0].ColumnNames[5]);
-
+            Assert.Equal("V(IN)", model.Prints[0].ColumnNames[2]);
+            Assert.Equal("V(0)", model.Prints[0].ColumnNames[3]);
+            Assert.Equal("V(OUT)", model.Prints[0].ColumnNames[4]);
             Assert.Single(model.Prints[0].Rows);
         }
 

diff --git a/src/SpiceSharpParser.IntegrationTests/SpiceSharpParser.IntegrationTests.csproj b/src/SpiceSharpParser.IntegrationTests/SpiceSharpParser.IntegrationTests.csproj
@@ -22,7 +22,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="SpiceSharp" Version="3.2.2" />
+    <PackageReference Include="SpiceSharp" Version="3.2.3" />
     <PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />

diff --git a/src/SpiceSharpParser.PerformanceTests/SpiceSharpParser.PerformanceTests.csproj b/src/SpiceSharpParser.PerformanceTests/SpiceSharpParser.PerformanceTests.csproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="SpiceSharp" Version="3.2.2" />
+    <PackageReference Include="SpiceSharp" Version="3.2.3" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
     <PackageReference Include="xunit.runner.console" Version="2.9.2">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/SpiceSharpParser.Tests/SpiceSharpParser.Tests.csproj b/src/SpiceSharpParser.Tests/SpiceSharpParser.Tests.csproj
@@ -20,7 +20,7 @@
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="SpiceSharp" Version="3.2.2" />
+    <PackageReference Include="SpiceSharp" Version="3.2.3" />
     <PackageReference Include="SpiceSharpBehavioral" Version="3.2.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>

diff --git a/...ser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentExport.cs b/...ser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentExport.cs
@@ -58,12 +58,32 @@ public CurrentExport(string name, ISimulationWithEvents simulation, string sourc
         /// </returns>
         public override double Extract()
         {
-            if (ExportRealImpl != null)
+             if (ExportRealImpl != null)
             {
+                if (!ExportRealImpl.IsValid)
+                {
+                    if (ExceptionsEnabled)
+                    {
+                        throw new SpiceSharpParserException($"Current export {Name} is invalid");
+                    }
+
+                    return double.NaN;
+                }
+
                 return ExportRealImpl.Value;
             }
             else
             {
+                if (!ExportImpl.IsValid)
+                {
+                    if (ExceptionsEnabled)
+                    {
+                        throw new SpiceSharpParserException($"Current export {Name} is invalid");
+                    }
+
+                    return double.NaN;
+                }
+
                 return ExportImpl.Value.Real;
             }
         }

diff --git a/...Readers/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentImaginaryExport.cs b/...Readers/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentImaginaryExport.cs
@@ -46,6 +46,16 @@ public CurrentImaginaryExport(string name, ISimulationWithEvents simulation, str
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Current imaginary export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value.Imaginary;
         }
     }

diff --git a/...Readers/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentMagnitudeExport.cs b/...Readers/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentMagnitudeExport.cs
@@ -46,6 +46,16 @@ public CurrentMagnitudeExport(string name, ISimulationWithEvents simulation, str
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Current magnitude export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value.Magnitude;
         }
     }

diff --git a/...odelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentPhaseExport.cs b/...odelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentPhaseExport.cs
@@ -46,6 +46,16 @@ public CurrentPhaseExport(string name, ISimulationWithEvents simulation, string
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Current phase export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value.Phase;
         }
     }

diff --git a/...ModelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentRealExport.cs b/...ModelReaders/Netlist/Spice/Readers/Controls/Exporters/CurrentExports/CurrentRealExport.cs
@@ -46,6 +46,16 @@ public CurrentRealExport(string name, ISimulationWithEvents simulation, string s
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Current real export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value;
         }
     }

diff --git a/...piceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/InputNoiseExport.cs b/...piceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/InputNoiseExport.cs
@@ -18,6 +18,16 @@ public InputNoiseExport(ISimulationWithEvents simulation)
 
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Input noise density export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value;
         }
     }

diff --git a/...iceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/OutputNoiseExport.cs b/...iceSharpParser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/OutputNoiseExport.cs
@@ -18,6 +18,16 @@ public OutputNoiseExport(ISimulationWithEvents simulation)
 
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Output noise density export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value;
         }
     }

diff --git a/...elReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageDecibelExport.cs b/...elReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageDecibelExport.cs
@@ -53,6 +53,16 @@ public VoltageDecibelExport(string name, ISimulationWithEvents simulation, strin
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Voltage (db) export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return Math.Log10(ExportImpl.Value.Magnitude);
         }
     }

diff --git a/...ser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageExport.cs b/...ser/ModelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageExport.cs
@@ -67,10 +67,30 @@ public override double Extract()
         {
             if (ExportImpl != null)
             {
+                if (!ExportImpl.IsValid)
+                {
+                    if (ExceptionsEnabled)
+                    {
+                        throw new SpiceSharpParserException($"Voltage export {Name} is invalid");
+                    }
+
+                    return double.NaN;
+                }
+
                 return ExportImpl.Value.Real;
             }
             else
             {
+                if (!ExportRealImpl.IsValid)
+                {
+                    if (ExceptionsEnabled)
+                    {
+                        throw new SpiceSharpParserException($"Voltage export {Name} is invalid");
+                    }
+
+                    return double.NaN;
+                }
+
                 return ExportRealImpl.Value;
             }
         }

diff --git a/...Readers/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageImaginaryExport.cs b/...Readers/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageImaginaryExport.cs
@@ -53,6 +53,16 @@ public VoltageImaginaryExport(string name, ISimulationWithEvents simulation, str
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Voltage imaginary export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value.Imaginary;
         }
     }

diff --git a/...Readers/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageMagnitudeExport.cs b/...Readers/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageMagnitudeExport.cs
@@ -52,6 +52,16 @@ public VoltageMagnitudeExport(string name, ISimulationWithEvents simulation, str
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Voltage magnitude export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value.Magnitude;
         }
     }

diff --git a/...odelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltagePhaseExport.cs b/...odelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltagePhaseExport.cs
@@ -52,6 +52,15 @@ public VoltagePhaseExport(string name, ISimulationWithEvents simulation, string
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Voltage phase export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
             return ExportImpl.Value.Magnitude;
         }
     }

diff --git a/...ModelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageRealExport.cs b/...ModelReaders/Netlist/Spice/Readers/Controls/Exporters/VoltageExports/VoltageRealExport.cs
@@ -52,6 +52,16 @@ public VoltageRealExport(string name, ISimulationWithEvents simulation, string n
         /// </returns>
         public override double Extract()
         {
+            if (!ExportImpl.IsValid)
+            {
+                if (ExceptionsEnabled)
+                {
+                    throw new SpiceSharpParserException($"Voltage real export {Name} is invalid");
+                }
+
+                return double.NaN;
+            }
+
             return ExportImpl.Value;
         }
     }