Implemented InMemory assembly loading.

Fixed MathAssembly with loading from byte array without app domains (memory leaks are possible in this case).

Author: KvanTTT

MathExpressions.NET.GUI/frmMain.cs

@@ -99,7 +99,7 @@ private void btnSave_Click(object sender, EventArgs e)
 			if (saveFileDialog1.ShowDialog() == System.Windows.Forms.DialogResult.OK)
 			{
 				if (Assembly != null)
-					Assembly.Finalize(Path.GetDirectoryName(saveFileDialog1.FileName), Path.GetFileName(saveFileDialog1.FileName));
+					Assembly.SaveToFile(Path.GetDirectoryName(saveFileDialog1.FileName), Path.GetFileName(saveFileDialog1.FileName));
 			}
 		}
 

MathExpressions.NET.Tests/MathFuncCompilationTests.cs

@@ -18,6 +18,18 @@ public void Init()
 			Helper.InitDefaultDerivatives();
 		}
 
+        [Test]
+        public void MemoryConsumption()
+        {
+            for (int i = 0; i < 10000000; i++)
+            {
+                using (var mathAssembly = new MathAssembly("x ^ 2", "x"))
+                {
+                    Assert.AreEqual(25, mathAssembly.Func(5));
+                }
+            }
+        }
+
 		[Test]
 		public void CompileFunc()
 		{

MathExpressions.NET/MathAssembly.cs

@@ -10,11 +10,6 @@ namespace MathExpressionsNET
     [Serializable]
     public class MathAssembly : IDisposable
     {
-        private static string _chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
-        private static Random _rand = new Random();
-
-        private AppDomain _domain;
-        private string _fileName = "MathFuncLib.dll";
         private object _mathFuncObj;
 
         public MethodInfo FuncMethodInfo
@@ -42,42 +37,22 @@ public double FuncDerivative(params object[] x)
         public MathAssembly(string expression, string variable)
         {
             var mathAssembly = new MathFuncAssemblyCecil();
-            _fileName = "MathFuncLib" + "_" + GenerateRandomString(6) + ".dll";
-            mathAssembly.CompileFuncAndDerivative(expression, variable, "", _fileName);
-            _domain = AppDomain.CreateDomain("MathFuncDomain");
-            _mathFuncObj = _domain.CreateInstanceFromAndUnwrap(_fileName, mathAssembly.NamespaceName + "." + mathAssembly.ClassName);
+            var fileName = "MathFuncLib" + "_" + Guid.NewGuid().ToString() + ".dll";
+            var assemblyBytes = mathAssembly.CompileFuncAndDerivativeInMemory(expression, variable, fileName);
+            var assembly = Assembly.Load(assemblyBytes);
+            _mathFuncObj = assembly.CreateInstance(mathAssembly.NamespaceName + "." + mathAssembly.ClassName);
             var mathFuncObjType = _mathFuncObj.GetType();
             FuncMethodInfo = mathFuncObjType.GetMethod(mathAssembly.FuncName);
             FuncDerivativeMethodInfo = mathFuncObjType.GetMethod(mathAssembly.FuncDerivativeName);
         }
 
         public void Dispose()
         {
-            if (_domain != null)
-                AppDomain.Unload(_domain);
-            File.Delete(_fileName);            
-        }
-
-        void _domain_DomainUnload(object sender, EventArgs e)
-        {
-            throw new NotImplementedException();
         }
 
         ~MathAssembly()
         {
             Dispose();
         }
-
-        public static string GenerateRandomString(int length)
-        {
-            byte[] bytes = new byte[length];
-            var random = new Random();
-            random.NextBytes(bytes);
-            StringBuilder result = new StringBuilder(length);
-            foreach (var b in bytes)
-                result.Append(_chars[b % _chars.Length]);
-
-            return result.ToString();
-        }
     }
 }

MathExpressions.NET/MathFuncAssemblyCecil.cs

@@ -47,24 +47,23 @@ public MathFuncAssemblyCecil(string namespaceName = "MathFuncLib", string classN
 			ClassName = className;
 		}
 
-        public void CompileFuncAndDerivative(string expression, string variable, string fileName = "")
+        public void CompileFuncAndDerivativeToFile(string expression, string variable, string fileName = "")
         {
-            CompileFuncAndDerivative(expression, variable, Path.GetDirectoryName(fileName), Path.GetFileName(fileName));
+            CompileFuncAndDerivativeToFile(expression, variable, Path.GetDirectoryName(fileName), Path.GetFileName(fileName));
         }
 
-		public void CompileFuncAndDerivative(string expression, string variable, string filePath = "", string name = "")
+		public void CompileFuncAndDerivativeToFile(string expression, string variable, string filePath = "", string name = "")
 		{
-			var func = new MathFunc(expression, variable, true, true);
-			var funcDer = new MathFunc(expression, variable, true, false).GetDerivative().GetPrecompilied();
-
-			Init(name);
-
-			func.Compile(this, FuncName);
-			funcDer.Compile(this, FuncDerivativeName);
-
-			Finalize(filePath, name);
+            CompileFuncAndDerivative(expression, variable, name);
+			SaveToFile(filePath, name);
 		}
 
+        public byte[] CompileFuncAndDerivativeInMemory(string expression, string variable, string name = "")
+        {
+            CompileFuncAndDerivative(expression, variable, name);
+            return SaveToBytes();
+        }
+
 		public void Init(string fileName = "MathFuncLib.dll")
 		{
             var name = new AssemblyNameDefinition(Path.GetFileNameWithoutExtension(fileName), new Version(1, 0, 0, 0));
@@ -86,12 +85,35 @@ public void Init(string fileName = "MathFuncLib.dll")
 			Class.Methods.Add(method);
 		}
 
-		public void Finalize(string path = "", string fileName = "")
+		public void SaveToFile(string path = "", string fileName = "")
 		{
 			Assembly.MainModule.Types.Add(Class);
 			Assembly.Write(Path.Combine(path, string.IsNullOrEmpty(fileName) ? NamespaceName + ".dll" : fileName));
 		}
 
+        public byte[] SaveToBytes()
+        {
+            Assembly.MainModule.Types.Add(Class);
+            byte[] result = null;
+            using (var stream = new MemoryStream())
+            {
+                Assembly.Write(stream);
+                result = stream.ToArray();
+            }
+            return result;
+        }
+
+        private void CompileFuncAndDerivative(string expression, string variable, string name = "")
+        {
+            var func = new MathFunc(expression, variable, true, true);
+            var funcDer = new MathFunc(expression, variable, true, false).GetDerivative().GetPrecompilied();
+
+            Init(name);
+
+            func.Compile(this, FuncName);
+            funcDer.Compile(this, FuncDerivativeName);
+        }
+
 		private void ImportMath(AssemblyDefinition assembly)
 		{
 			TypesReferences = new Dictionary<KnownFuncType, MethodReference>();