Fixed tests.

KvanTTT · KvanTTT · commit c8c715e2a929 · 2014-02-03T01:57:16.000+04:00
Added icons. fixed #3
diff --git a/MathFunctions.GUI/MathFunctions.GUI.csproj b/MathFunctions.GUI/MathFunctions.GUI.csproj
@@ -33,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>icon_big.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="GOLD Engine, Version=5.0.4337.25397, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\Dependencies\GOLD Engine.dll</HintPath>
@@ -90,6 +93,9 @@
       <Name>MathFunctions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="icon_big.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MathFunctions.GUI/frmMain.Designer.cs b/MathFunctions.GUI/frmMain.Designer.cs
diff --git a/MathFunctions.GUI/frmMain.resx b/MathFunctions.GUI/frmMain.resx
@@ -146,10 +146,112 @@ round(f(x))' = 0;</value>
   <metadata name="clnDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="clnPos.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="clnDescription.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="saveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>69</value>
+    <value>61</value>
   </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAIAEBAAAAAAIABoBAAAJgAAACAgAAAAACAAqBAAAI4EAAAoAAAAEAAAACAAAAABACAAAAAAAEAE
+        AAAAAAAAAAAAAAAAAAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/ycnJ/9HR0f/g4OD/3t7e/7y8vP/g4OD/4ODg/87O
+        zv/Nzc3/4ODg/+Dg4P/b29v/v7+//+Dg4P/g4OD/4ODg/3Nzc/9xcXH/4ODg/97e3v8XFxf/z8/P/+Dg
+        4P+Pj4//VVVV/+Dg4P/g4OD/19fX/xISEv/b29v/4ODg/+Dg4P+jo6P/QUFB/+Dg4P/g4OD/QkJC/6Ki
+        ov/g4OD/v7+//yYmJv/g4OD/4ODg/+Dg4P8uLi7/t7e3/+Dg4P/g4OD/0NDQ/xUVFf/e3t7/4ODg/3Jy
+        cv9zc3P/4ODg/9/f3/8SEhL/1NTU/+Dg4P/g4OD/XV1d/4eHh//g4OD/4ODg/+Dg4P8hISH/wcHB/+Dg
+        4P+ioqL/QkJC/+Dg4P/g4OD/Pz8//6enp//g4OD/4ODg/42Njf9XV1f/4ODg/+Dg4P/g4OD/UVFR/1pa
+        Wv/f39//u7u7/wYGBv+0tLT/4ODg/1paWv9/f3//4ODg/+Dg4P+9vb3/KCgo/+Dg4P/g4OD/4ODg/4WF
+        hf9ERET/PDw8/xsbG/9FRUX/W1tb/zg4OP8MDAz/ioqK/5+fn//g4OD/W1tb/wQEBP8wMDD/19fX/+Dg
+        4P/f39//39/f/9zc3P/Kysr/3t7e/+Dg4P/S0tL/09PT/9zc3P9PT0//4ODg/9/f3/87Ozv/p6en/9/f
+        3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/Tk5O/7y8vP/g4OD/iIiI/zIy
+        Mv+mpqb/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/4qKiv9fX1//4ODg/9/f
+        3/+vr6//tbW1/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/IyMj/Gxsb/97e
+        3v/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/9fX
+        1//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAA//8AAP//AAD//wAA//8AAP//AAD//wAA//8AAP//AAD//wAA
+        //8AAP//AAD//wAA//8AAP//AAD//wAA//8oAAAAIAAAAEAAAAABACAAAAAAAIAQAAAAAAAAAAAAAAAA
+        AAAAAAAA4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/Q0ND/lJSU/6enp//g4OD/4ODg/+Dg4P/g4OD/2NjY/5WVlf+dnZ3/4ODg/+Dg4P/g4OD/4ODg/97e
+        3v+ampr/mZmZ/9zc3P/g4OD/4ODg/+Dg4P/g4OD/4ODg/83Nzf+UlJT/q6ur/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/8rKyv8FBQX/Gxsb/9/f3//g4OD/4ODg/+Dg4P/Z2dn/FBQU/wsLC//S0tL/4ODg/+Dg
+        4P/g4OD/4ODg/ycnJ/8CAgL/wcHB/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/w8PD/wMDA/8lJSX/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/3t7e/yIiIv8EBAT/xsbG/+Dg4P/g4OD/4ODg/+Dg4P89PT3/AAAA/6ys
+        rP/g4OD/4ODg/+Dg4P/g4OD/V1dX/wAAAP+UlJT/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/c3Nz/Ghoa/wcH
+        B//Nzc3/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/Tk5O/wAAAP+ampr/4ODg/+Dg4P/g4OD/4ODg/21t
+        bf8AAAD/fX19/+Dg4P/g4OD/4ODg/+Dg4P+Hh4f/AAAA/2VlZf/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P9ERET/AAAA/6ampv/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P9+fn7/AAAA/2pqav/g4OD/4ODg/+Dg
+        4P/g4OD/nZ2d/wAAAP9NTU3/4ODg/+Dg4P/g4OD/4ODg/7e3t/8AAAD/NTU1/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/3V1df8AAAD/dnZ2/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/62trf8AAAD/Ozs7/+Dg
+        4P/g4OD/4ODg/+Dg4P/Kysr/AgIC/yAgIP/e3t7/4ODg/+Dg4P/g4OD/3d3d/wkJCf8MDAz/2tra/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/pKSk/wAAAP9GRkb/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/1tbW/wcH
+        B/8SEhL/2dnZ/+Dg4P/g4OD/4ODg/+Dg4P8cHBz/AgIC/8zMzP/g4OD/4ODg/+Dg4P/g4OD/NjY2/wAA
+        AP+3t7f/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/R0dH/AgIC/xsbG//d3d3/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/LCws/wAAAP+7u7v/4ODg/+Dg4P/g4OD/4ODg/01NTf8AAAD/np6e/+Dg4P/g4OD/4ODg/+Dg
+        4P9mZmb/AAAA/4aGhv/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P8jIyP/AAAA/8fHx//g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P9bW1v/AAAA/4qKiv/g4OD/4ODg/+Dg4P/g4OD/fHx8/wAAAP9sbGz/4ODg/+Dg
+        4P/g4OD/4ODg/5aWlv8AAAD/WFhY/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/1JSUv8AAAD/mJiY/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/4uLi/8AAAD/Ly8v/9zc3P/g4OD/4ODg/+Dg4P+jo6P/AAAA/xsb
+        G//U1NT/4ODg/+Dg4P/g4OD/xMTE/wAAAP8rKyv/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/goKC/wAA
+        AP9oaGj/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/urq6/wAAAP8AAAD/Xl5e/9zc3P/g4OD/4ODg/4qK
+        iv8AAAD/AAAA/0pKSv/V1dX/4ODg/+Dg4P+lpaX/AAAA/xQUFP/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P+ysrL/AAAA/zk5Of/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/Y2Nj/EhIS/w4ODv8eHh7/KCgo/29v
+        b/9hYWH/CwsL/wAAAP83Nzf/IiIi/xwcHP9nZ2f/bW1t/xUVFf8AAAD/Pz8//5OTk/+UlJT/4ODg/+Dg
+        4P/g4OD/hISE/0BAQP8BAQH/CAgI/0VFRf9KSkr/3Nzc/+Dg4P/g4OD/4ODg/+Dg4P9LS0v/IyMj/8LC
+        wv9TU1P/CAgI/wAAAP8AAAD/ISEh/7+/v//Q0ND/Xl5e/wwMDP8AAAD/AAAA/xsbG/+6urr/nZ2d/yws
+        LP/f39//4ODg/+Dg4P+Li4v/HR0d/wkJCf8AAAD/FRUV/x4eHv/BwcH/4ODg/+Dg4P/g4OD/4ODg/97e
+        3v/d3d3/4ODg/+Dg4P/Q0ND/srKy/7e3t//a2tr/4ODg/+Dg4P/g4OD/1NTU/7S0tP+1tbX/2NjY/+Dg
+        4P/T09P/DAwM/6urq//g4OD/4ODg/9/f3//d3d3/XV1d/wAAAP+JiYn/3d3d/9/f3//g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P87Ozv/TExM/+Dg4P/g4OD/4ODg/+Dg4P+Pj4//AAAA/1dXV//g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/3p6ev8ICAj/xsbG/+Dg4P/g4OD/4ODg/8fHx/8GBgb/ERER/7W1
+        tf/d3d3/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/uLi4/wAAAP9tbW3/4ODg/+Dg4P/g4OD/4ODg/3Nz
+        c/8CAgL/AAAA/wsLC//S0tL/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/c3Nz/Ghoa/xYWFv/a2tr/4ODg/+Dg
+        4P/g4OD/39/f/6Ghof9bW1v/TExM/8jIyP/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P9VVVX/AAAA/4+P
+        j//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/5SU
+        lP8AAAD/NDQ0/9/f3//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/zs7O/xISEv8nJyf/3Nzc/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/y8vL/9PT0//g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/+Dg
+        4P/g4OD/4ODg/+Dg4P/g4OD/4ODg/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+</value>
+  </data>
 </root>
diff --git a/MathFunctions.GUI/icon_big.ico b/MathFunctions.GUI/icon_big.ico
diff --git a/MathFunctions.GUI/icon_small.ico b/MathFunctions.GUI/icon_small.ico
diff --git a/MathFunctions.Tests/MathFuncCompilationTests.cs b/MathFunctions.Tests/MathFuncCompilationTests.cs
@@ -19,13 +19,7 @@ public void Init()
 		}
 
 		[Test]
-		public void TestFunc(double x)
-		{
-			//return Math.Pow((2 * -x + 1), (2 * x + 1)) * Math.Sin((2 * x + 1) * (2 * x + 1) * (2 * x + 1));
-		}
-
-		[Test]
-		public void CompileFuncTest1()
+		public void CompileFunc()
 		{
 			var expectedFunc = new Func<double, double>(x => Math.Sin(x) + Math.Pow(x, Math.Log(5 * x) - 10 / x));
 			using (var mathAssembly = new MathAssembly("Sin(x) + x ^ (Ln(5 * x) - 10 / x)", "x"))
@@ -34,5 +28,29 @@ public void CompileFuncTest1()
 					Assert.AreEqual(expectedFunc(i), mathAssembly.SimpleFunc(i));
 			}
 		}
+
+		[Test]
+		public void CompileFuncWithParameter()
+		{
+			var expectedFunc = new Func<double, double, double, double>((x, a, b) =>
+				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 }));
+			}
+		}
+
+		[Test]
+		public void CompileFuncWithUnknownFunc()
+		{
+			double delta = 0.000001;
+			var expectedFunc = new Func<double, Func<double, double>, double>((x, f) => 
+				Math.Cos(f(x)) * (f(x + delta) - f(x)) / delta); // derivative of sin(f(x))
+			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 }));
+			}
+		}
 	}
 }
diff --git a/MathFunctions.Tests/MathFuncDerivativeTest.cs b/MathFunctions.Tests/MathFuncDerivativeTest.cs
@@ -101,7 +101,7 @@ public void Derivative5()
 		[Test]
 		public void Derivative6()
 		{
-			string expression = "arctan(sqrt(x)) * ln(x)";
+			string expression = "atan(sqrt(x)) * ln(x)";
 			Assert.IsTrue(WolframAlphaUtils.CheckDerivative(expression, GetDerivativeExpression(expression)));
 		}
 
diff --git a/MathFunctions.Tests/WolframAlphaUtils.cs b/MathFunctions.Tests/WolframAlphaUtils.cs
@@ -14,7 +14,6 @@ public static class WolframAlphaUtils
 		public static bool CheckDerivative(string expression, string derivative)
 		{
 			return CheckEquality("diff(" + expression + ")", derivative);
-			//return CheckDerivative2(expression, derivative);
 		}
 
 		public static bool CheckEquality(string expression1, string expression2)
diff --git a/MathFunctions/KnownFunc.cs b/MathFunctions/KnownFunc.cs
@@ -54,8 +54,8 @@ public class KnownFunc
 			{ "^", KnownFuncType.Exp},
 			{ "exp", KnownFuncType.Exp},
 			
-			{ "log", KnownFuncType.Log},
-			{ "diff", KnownFuncType.Diff}
+			{ "log", KnownFuncType.Log },
+			{ "diff", KnownFuncType.Diff }
 		};
 
 		public static List<KnownFuncType> SpecFuncs = new List<KnownFuncType>()
diff --git a/MathFunctions/MathAssembly.cs b/MathFunctions/MathAssembly.cs
@@ -9,6 +9,9 @@ namespace MathFunctions
 {
 	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;
@@ -38,6 +41,7 @@ public double SimpleFuncDerivative(double 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);
@@ -52,5 +56,17 @@ public void Dispose()
 				AppDomain.Unload(_domain);
 			File.Delete(_fileName);
 		}
+
+		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();
+		}
 	}
 }
diff --git a/MathFunctions/MathFuncAssemblyCecil.cs b/MathFunctions/MathFuncAssemblyCecil.cs
@@ -52,27 +52,26 @@ public void CompileFuncAndDerivative(string expression, string variable, string
 			var func = new MathFunc(expression, variable, true, true);
 			var funcDer = new MathFunc(expression, variable, true, false).GetDerivative().GetPrecompilied();
 
-			Init();
+			Init(fileName);
 
 			func.Compile(this, FuncName);
 			funcDer.Compile(this, FuncDerivativeName);
 
 			Finalize(path, fileName);
 		}
 
-		public void Init()
+		public void Init(string fileName)
 		{
-			var name = new AssemblyNameDefinition(NamespaceName, new Version(1, 0, 0, 0));
-			Assembly = AssemblyDefinition.CreateAssembly(name, NamespaceName + ".dll", ModuleKind.Dll);
+			var name = new AssemblyNameDefinition(fileName.Replace(".dll", ""), new Version(1, 0, 0, 0));
+			Assembly = AssemblyDefinition.CreateAssembly(name, fileName, ModuleKind.Dll);
 
 			ImportMath(Assembly);
 			InvokeFuncRef = Assembly.MainModule.Import(typeof(Func<double, double>).GetMethod("Invoke"));
 			DoubleType = Assembly.MainModule.TypeSystem.Double;
 
 			Class = new TypeDefinition(NamespaceName, ClassName,
 				TypeAttributes.Public | TypeAttributes.BeforeFieldInit | TypeAttributes.Serializable |
-				TypeAttributes.AnsiClass /*| TypeAttributes.Sealed /*| TypeAttributes.Abstract*/,
-				Assembly.MainModule.TypeSystem.Object);
+				TypeAttributes.AnsiClass, Assembly.MainModule.TypeSystem.Object);
 
 			var methodAttributes = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.SpecialName | MethodAttributes.RTSpecialName;
 			var method = new MethodDefinition(".ctor", methodAttributes, Assembly.MainModule.TypeSystem.Void);
diff --git a/MathFunctions/MathFuncGenerator.cs b/MathFunctions/MathFuncGenerator.cs
@@ -7,6 +7,8 @@ namespace MathFunctions
 {
 	public class MathFuncGenerator
 	{
+		private static KnownFuncType[] _unaryFuncs;
+		private static KnownFuncType[] _binaryFuncs;
 		private Random _rand = new Random();
 
 		public double ValueProb = 0.2;
@@ -25,14 +27,21 @@ public class MathFuncGenerator
 		public double UnknownFuncProb = 0.05;
 		public double KnownFuncProb = 0.95;
 
-		public double UnaryFracProb = 0.3;
-		public double BinaryFracProb = 0.7;
+		public double UnaryFuncProb = 0.6;
+		public double BinaryFuncProb = 0.4;
 
-		//public double AdditionFuncProb
+		public double AdditionFuncProb = 0.3;
+		public double MultiplicationFuncProb = 0.3;
 
 		public int MaxSummandsCount = 5;
 		public int MaxFactorsCount = 4;
 
+		static MathFuncGenerator()
+		{
+			_unaryFuncs = KnownFunc.UnaryFuncsNames.Keys.ToArray();
+			_binaryFuncs = KnownFunc.BinaryFuncsNames.Keys.Where(func => func != KnownFuncType.Add && func != KnownFuncType.Mult).ToArray();
+		}
+
 		public MathFunc Generate(string varName, string[] constNames, string[] unknownFuncNames)
 		{
 			bool error = false;
@@ -63,7 +72,7 @@ public MathFuncNode Generate(int curDepth, string varName, string[] constNames,
 				r = ValueProb + ConstProb + VarProb;
 			if (curDepth == MaxDepth && r > ValueProb + ConstProb + VarProb)
 				r *= (ValueProb + ConstProb + VarProb);
-			double r1;
+			double r1, r2, r3;
 
 			if (r < ValueProb)
 			{
@@ -99,9 +108,19 @@ public MathFuncNode Generate(int curDepth, string varName, string[] constNames,
 					KnownFuncType randFuncType;
 					do
 					{
-						//r2 = _rand.NextDouble();
-						//if (r2 < UnaryFracProb)
-						randFuncType = (KnownFuncType)values.GetValue(_rand.Next(values.Length));
+						r2 = _rand.NextDouble();
+						if (r2 < AdditionFuncProb)
+							randFuncType = KnownFuncType.Add;
+						else if (r2 < AdditionFuncProb + MultiplicationFuncProb)
+							randFuncType = KnownFuncType.Mult;
+						else
+						{
+							r3 = _rand.NextDouble();
+							if (r3 < UnaryFuncProb)
+								randFuncType = _unaryFuncs[_rand.Next(_unaryFuncs.Length)];
+							else
+								randFuncType = _binaryFuncs[_rand.Next(_binaryFuncs.Length)];
+						}
 					}
 					while (KnownFunc.SpecFuncs.Contains(randFuncType));
 

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public void Derivative5()`
`101`	`101`	`[Test]`
`102`	`102`	`public void Derivative6()`
`103`	`103`	`{`
`104`		`- string expression = "arctan(sqrt(x)) * ln(x)";`
	`104`	`+ string expression = "atan(sqrt(x)) * ln(x)";`
`105`	`105`	`Assert.IsTrue(WolframAlphaUtils.CheckDerivative(expression, GetDerivativeExpression(expression)));`
`106`	`106`	`}`
`107`	`107`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public static class WolframAlphaUtils`
`14`	`14`	`public static bool CheckDerivative(string expression, string derivative)`
`15`	`15`	`{`
`16`	`16`	`return CheckEquality("diff(" + expression + ")", derivative);`
`17`		`- //return CheckDerivative2(expression, derivative);`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`public static bool CheckEquality(string expression1, string expression2)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ namespace MathFunctions`
`9`	`9`	`{`
`10`	`10`	`public class MathAssembly : IDisposable`
`11`	`11`	`{`
	`12`	`+ private static string _chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";`
	`13`	`+ private static Random _rand = new Random();`
	`14`	`+`
`12`	`15`	`private AppDomain _domain;`
`13`	`16`	`private string _fileName = "MathFuncLib.dll";`
`14`	`17`	`private object _mathFuncObj;`
`@@ -38,6 +41,7 @@ public double SimpleFuncDerivative(double x)`
`38`	`41`	`public MathAssembly(string expression, string variable)`
`39`	`42`	`{`
`40`	`43`	`var mathAssembly = new MathFuncAssemblyCecil();`
	`44`	`+ _fileName = "MathFuncLib" + "_" + GenerateRandomString(6) + ".dll";`
`41`	`45`	`mathAssembly.CompileFuncAndDerivative(expression, variable, "", _fileName);`
`42`	`46`	`_domain = AppDomain.CreateDomain("MathFuncDomain");`
`43`	`47`	`_mathFuncObj = _domain.CreateInstanceFromAndUnwrap(_fileName, mathAssembly.NamespaceName + "." + mathAssembly.ClassName);`
`@@ -52,5 +56,17 @@ public void Dispose()`
`52`	`56`	`AppDomain.Unload(_domain);`
`53`	`57`	`File.Delete(_fileName);`
`54`	`58`	`}`
	`59`	`+`
	`60`	`+ public static string GenerateRandomString(int length)`
	`61`	`+ {`
	`62`	`+ byte[] bytes = new byte[length];`
	`63`	`+ var random = new Random();`
	`64`	`+ random.NextBytes(bytes);`
	`65`	`+ StringBuilder result = new StringBuilder(length);`
	`66`	`+ foreach (var b in bytes)`
	`67`	`+ result.Append(_chars[b % _chars.Length]);`
	`68`	`+`
	`69`	`+ return result.ToString();`
	`70`	`+ }`
`55`	`71`	`}`
`56`	`72`	`}`