Fixed some derivative errors.

Improved expression formatting.
Renamed namespaces.

Author: KvanTTT

MathExpressions.NET.GUI/MathExpressions.NET.GUI.csproj

@@ -8,8 +8,8 @@
     <ProjectGuid>{2C0616FA-AAC1-4F22-9655-731F308FE4F2}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MathExpressions.NET.GUI</RootNamespace>
-    <AssemblyName>MathFunctions.GUI</AssemblyName>
+    <RootNamespace>MathExpressionsNET.GUI</RootNamespace>
+    <AssemblyName>MathExpressions.NET.GUI</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>

MathExpressions.NET.GUI/Program.cs

@@ -3,7 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 
-namespace MathExpressions.NET.GUI
+namespace MathExpressionsNET.GUI
 {
 	static class Program
 	{

MathExpressions.NET.GUI/Properties/Resources.Designer.cs

@@ -8,11 +8,11 @@
 using System.Windows.Forms;
 using System.IO;
 using GOLD;
-using MathExpressions.NET.GUI.Properties;
+using MathExpressionsNET.GUI.Properties;
 using System.Globalization;
 using System.Threading;
 
-namespace MathExpressions.NET.GUI
+namespace MathExpressionsNET.GUI
 {
 	public partial class frmMain : Form
 	{
@@ -130,10 +130,11 @@ private void UpdateResult()
 
 				var variable = string.IsNullOrEmpty(tbVar.Text) ? null : new VarNode(tbVar.Text.ToLowerInvariant());
 
+				string input = tbInput.Text.Replace(Environment.NewLine, "");
 				MathFunc simplifiedFunc = null;
 				try
 				{
-					simplifiedFunc = new MathFunc(tbInput.Text, tbVar.Text).Simplify();
+					simplifiedFunc = new MathFunc(input, tbVar.Text).Simplify();
 					tbSimplification.Text = simplifiedFunc.ToString();
 					tbSimplifiedOpt.Text = simplifiedFunc.GetPrecompilied().ToString();
 				}
@@ -152,7 +153,7 @@ private void UpdateResult()
 
 				try
 				{
-					var compileFunc = new MathFunc(tbInput.Text, tbVar.Text, true, true);
+					var compileFunc = new MathFunc(input, tbVar.Text, true, true);
 					compileFunc.Compile(Assembly, "Func");
 
 					var sb = new StringBuilder();
@@ -170,7 +171,7 @@ private void UpdateResult()
 					MathFunc derivativeFunc = null;
 					try
 					{
-						derivativeFunc = new MathFunc(tbInput.Text, tbVar.Text).GetDerivative();
+						derivativeFunc = new MathFunc(input, tbVar.Text).GetDerivative();
 						tbDerivative.Text = derivativeFunc.ToString();
 						tbDerivativeOpt.Text = derivativeFunc.GetPrecompilied().ToString();
 					}
@@ -187,7 +188,6 @@ private void UpdateResult()
 					try
 					{
 						var compileDerivativeFunc = new MathFunc(tbDerivative.Text, tbVar.Text, true, true);
-						compileDerivativeFunc.DerivativeDelta = double.Parse(tbDerivativeDelta.Text);
 						compileDerivativeFunc.Compile(Assembly, "FuncDerivative");
 						var sb = new StringBuilder();
 						compileDerivativeFunc.Instructions.ToList().ForEach(instr => sb.AppendLine(instr.ToString().Replace("IL_0000: ", "")));

MathExpressions.NET.GUI/Properties/Settings.Designer.cs

@@ -8,8 +8,8 @@
     <ProjectGuid>{BF78CC00-AB67-4D51-8B47-5A6DA94984AC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>MathExpressions.NET.Tests</RootNamespace>
-    <AssemblyName>MathFunctions.Tests</AssemblyName>
+    <RootNamespace>MathExpressionsNET.Tests</RootNamespace>
+    <AssemblyName>MathExpressions.NET.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>

MathExpressions.NET.GUI/frmMain.Designer.cs

@@ -7,7 +7,7 @@
 using System.Security.Policy;
 using System.IO;
 
-namespace MathExpressions.NET.Tests
+namespace MathExpressionsNET.Tests
 {
 	[TestFixture]
 	public class MathFuncCompilationTests
@@ -25,7 +25,7 @@ public void CompileFunc()
 			using (var mathAssembly = new MathAssembly("Sin(x) + x ^ (Ln(5 * x) - 10 / x)", "x"))
 			{
 				for (int i = 1; i < 10; i++)
-					Assert.AreEqual(expectedFunc(i), mathAssembly.SimpleFunc(i));
+					Assert.AreEqual(expectedFunc(i), mathAssembly.Func(i));
 			}
 		}
 
@@ -36,7 +36,7 @@ public void CompileFuncWithParameter()
 				Math.Cos(x * b) * b - Math.Log(a) / Math.Pow(Math.Log(x), 2) / x); // derivative of log(x, a) + sin(x * b)
 			using (var mathAssembly = new MathAssembly(new MathFunc("log(x, a) + sin(x * b)", "x").GetDerivative().ToString(), "x"))
 			{
-				Assert.AreEqual(expectedFunc(5, 3, 4), mathAssembly.Func.Invoke(null, new object[] { 5, 3, 4 }));
+				Assert.AreEqual(expectedFunc(5, 3, 4), mathAssembly.Func(5, 3, 4));
 			}
 		}
 
@@ -49,7 +49,7 @@ public void CompileFuncWithUnknownFunc()
 			using (var mathAssembly = new MathAssembly("sin(a(x))", "x"))
 			{
 				var func = new Func<double, double>(x => x * x);
-				Assert.AreEqual(expectedFunc(5, func), mathAssembly.FuncDerivative.Invoke(null, new object[] { 5, func }));
+				Assert.AreEqual(expectedFunc(5, func), mathAssembly.FuncDerivative(5, func));
 			}
 		}
 
@@ -70,7 +70,7 @@ public void CompileSampleFunc()
 					if (!double.IsNaN(dotnet))
 					{
 						var correct = WolframAlphaUtils.GetValue(exprString, new KeyValuePair<string, double>("x", x));
-						var actual = mathAssembly.SimpleFunc(x);
+						var actual = mathAssembly.Func(x);
 						Assert.LessOrEqual(Math.Abs(correct - actual), Math.Abs(dotnet - actual));
 						i++;
 					}

MathExpressions.NET.GUI/frmMain.cs

@@ -4,7 +4,7 @@
 using System.Text;
 using NUnit.Framework;
 
-namespace MathExpressions.NET.Tests
+namespace MathExpressionsNET.Tests
 {
 	[TestFixture]
 	public class MathFuncDerivativeTest
@@ -42,7 +42,7 @@ public void OneDivOneDerivativeTest()
 		[Test]
 		public void DerivativeDerivativeTest()
 		{
-			var f = new MathFunc("diff(x ^ 3)");
+			var f = new MathFunc("diff(x ^ 3, x)");
 			var derivative = f.GetDerivative();
 			Assert.IsTrue(derivative == "x * 6");
 		}
@@ -60,7 +60,15 @@ public void UnknownFuncDerivativeTest()
 		{
 			var f = new MathFunc("f(x)");
 			var derivative = f.GetDerivative();
-			Assert.IsTrue(derivative == "diff(f(x))");
+			Assert.IsTrue(derivative == "diff(f(x), x)");
+		}
+
+		[Test]
+		public void UnknownFuncThirdDerivativeTest()
+		{
+			var f = new MathFunc("f(x)");
+			var derivative = f.GetDerivative().GetDerivative().GetDerivative();
+			Assert.IsTrue(derivative == "diff(diff(diff(f(x), x), x), x)");
 		}
 
 		[Test]

MathExpressions.NET.Tests/MathExpressions.NET.Tests.csproj

@@ -6,7 +6,7 @@
 using System.Text;
 using System.Threading;
 
-namespace MathExpressions.NET.Tests
+namespace MathExpressionsNET.Tests
 {
 	[TestFixture]
 	public class MathFuncPrecompileTests