Fixed mixing of parameters and variables.

Calculated Node included to compilation unit.

Author: KvanTTT

MathFunctions.GUI/frmMain.Designer.cs

@@ -130,7 +130,7 @@ private void btnCalculate_Click(object sender, EventArgs e)
 				MathFunc derivativeFunc = null;
 				try
 				{
-					derivativeFunc = new MathFunc(tbInput.Text).GetDerivative();
+					derivativeFunc = new MathFunc(tbInput.Text, tbVar.Text).GetDerivative();
 					tbDerivative.Text = derivativeFunc.ToString();
 				}
 				catch (Exception ex)
@@ -168,5 +168,10 @@ private void btnSave_Click(object sender, EventArgs e)
 					Assembly.Finalize(Path.GetDirectoryName(saveFileDialog1.FileName), Path.GetFileName(saveFileDialog1.FileName));
 			}
 		}
+
+		private void tbResultExpression_Click(object sender, EventArgs e)
+		{
+			(sender as TextBox).SelectAll();
+		}
 	}
 }

MathFunctions.GUI/frmMain.cs

@@ -158,6 +158,6 @@ log(f(x), g(x))' = g'(x)/(g(x)*ln(f(x))) - (f'(x)*ln(g(x)))/(f(x)*ln(f(x))^2);
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>56</value>
+    <value>107</value>
   </metadata>
 </root>

MathFunctions.GUI/frmMain.resx

@@ -265,7 +265,7 @@ private void CreateNewObject(Reduction r)
 
 			case ProductionIndex.Statement:
 				// <Statement> ::= <Expression>
-				Funcs.Push(new MathFunc(Nodes.Pop()));
+				Funcs.Push(new MathFunc(Nodes.Pop(), null, Parameters.Select(p => p.Value)));
 				break;
 
 			case ProductionIndex.Expression:

MathFunctions.v11.suo

@@ -280,6 +280,8 @@ protected void ConstToVar(MathFuncNode node)
 			for (int i = 0; i < node.Childs.Count; i++)
 				if (node.Childs[i] == null || node.Childs[i].Name == Variable.Name)
 					node.Childs[i] = Variable;
+				else if (node.Childs[i].Type == MathNodeType.Variable)
+					node.Childs[i] = new ConstNode(node.Childs[i].Name);
 				else
 					ConstToVar(node.Childs[i]);
 		}

MathFunctions/MathExprParser.cs

@@ -197,6 +197,10 @@ private void EmitNode(MathFuncNode node, bool abs = false)
 		{
 			switch (node.Type)
 			{
+				case MathNodeType.Calculated:
+					IlInstructions.Add(new OpCodeArg(OpCodes.Ldc_R8,
+						abs ? Math.Abs(((CalculatedNode)node).Value) : ((CalculatedNode)node).Value));
+					break;
 				case MathNodeType.Value:
 					IlInstructions.Add(new OpCodeArg(OpCodes.Ldc_R8,
 						abs ? Math.Abs(((ValueNode)node).Value.ToDouble()) : ((ValueNode)node).Value.ToDouble()));
@@ -237,7 +241,7 @@ private bool EmitFunc(FuncNode funcNode, bool abs = false)
 				case KnownFuncType.Mult:
 					return EmitMultFunc(funcNode);
 				case KnownFuncType.Div:
-					throw new NotSupportedException("replace devision with inversation and multiplication");
+					throw new NotSupportedException("replace division with inversation and multiplication");
 				case KnownFuncType.Neg:
 					return EmitNegFunc(funcNode, abs);
 				case KnownFuncType.Exp:

MathFunctions/MathFunc.cs

@@ -12,7 +12,7 @@ public MathFunc GetDerivative()
 		{
 			var result = Simplify(GetDerivative(Root));
 			result.Sort();
-			return new MathFunc(result);
+			return new MathFunc(result, Variable, Parameters.Select(p => p.Value));
 		}
 
 		#region Helpers