Fixes

Author: marcin-golebiowski

src/SpiceSharpParser.IntegrationTests/Examples/Extensions/CustomMosfetModelTest.cs

@@ -1,4 +1,6 @@
-using System.IO;
+using SpiceSharpParser.ModelReaders.Netlist.Spice.Readers.EntityGenerators.Components.Semiconductors;
+using SpiceSharpParser.ModelReaders.Netlist.Spice.Readers.EntityGenerators.Models;
+using System.IO;
 using Xunit;
 
 namespace SpiceSharpParser.IntegrationTests.Examples.Extensions
@@ -18,9 +20,19 @@ public void When_CustomMosfetModel_Used_NoExceptions()
             // Convert to Spice#
             var spiceSharpReader = new SpiceSharpReader();
             spiceSharpReader.Settings.CaseSensitivity.IsModelTypeCaseSensitive = false;
-            spiceSharpReader.Settings.Mappings.Models.Map(new[] { "PMOS", "NMOS" }, new CustomMosfetModelGenerator());
-            var spiceSharpModel = spiceSharpReader.Read(parseResult.FinalModel);
 
+
+            // custom mappings
+            var modelGenerator = new MosfetModelGenerator();
+            modelGenerator.AddLevel<SpiceSharp.Components.Mosfet1Model, SpiceSharp.Components.Mosfets.Level1.ModelParameters>(39);
+            spiceSharpReader.Settings.Mappings.Models.Map(new[] { "PMOS", "NMOS" }, modelGenerator);
+            var mosfetGenerator = new MosfetGenerator();
+            mosfetGenerator.AddMosfet<SpiceSharp.Components.Mosfet1Model, SpiceSharp.Components.Mosfet1>();
+            spiceSharpReader.Settings.Mappings.Components.Map("M", mosfetGenerator);
+
+
+            var spiceSharpModel = spiceSharpReader.Read(parseResult.FinalModel);
+            
             Assert.False(spiceSharpModel.ValidationResult.HasError);
             Assert.False(spiceSharpModel.ValidationResult.HasWarning);
         }

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/EntityGenerators/Components/Semiconductors/MosfetGenerator.cs

@@ -35,11 +35,10 @@ public MosfetGenerator()
             });
         }
 
-        protected static Dictionary<Type, Func<string, MosfetDetails>> Mosfets { get; } = new ();
+        protected Dictionary<Type, Func<string, MosfetDetails>> Mosfets { get; } = new ();
 
-        public static void AddMosfet<TModel, TMosfet>()
+        public void AddMosfet<TModel, TMosfet>()
             where TMosfet : SpiceSharp.Components.Component
-            where TModel : Context.Models.Model
         {
             Mosfets.Add(typeof(TModel), (name) =>
             {

src/SpiceSharpParser/ModelReaders/Netlist/Spice/Readers/EntityGenerators/Models/MosfetModelGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using SpiceSharp;
 using SpiceSharp.Components;
 using SpiceSharp.Components.Mosfets;
 using SpiceSharp.Entities;
@@ -56,10 +57,11 @@ public MosfetModelGenerator()
         /// Gets available model generators indexed by their LEVEL.
         /// The parameters passed are name, type (nmos or pmos) and the version.
         /// </summary>
-        protected static Dictionary<int, Func<string, string, string, Context.Models.Model>> Levels { get; } = new Dictionary<int, Func<string, string, string, Context.Models.Model>>();
+        protected Dictionary<int, Func<string, string, string, Context.Models.Model>> Levels { get; } = new Dictionary<int, Func<string, string, string, Context.Models.Model>>();
 
-        public static void AddLevel<TModel>(int level)
-            where TModel : Entity<Parameters>
+        public void AddLevel<TModel, TParameters>(int level)
+            where TModel : Entity<TParameters>
+            where TParameters : ModelParameters, ICloneable<TParameters>, new()
         {
             Levels[level] = (name, type, _) =>
             {