Closed #57

sys27 · Oct 25, 2013 · b809f59 · b809f59
1 parent d8d866a
commit b809f59
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("Release")]
 #endif
 
-[assembly: AssemblyVersion("2.8.2")]
-[assembly: AssemblyFileVersion("2.8.2")]
-[assembly: AssemblyInformationalVersion("2.8.2")]
+[assembly: AssemblyVersion("2.8.3")]
+[assembly: AssemblyFileVersion("2.8.3")]
+[assembly: AssemblyInformationalVersion("2.8.3")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/xFunc.Maths/Expressions/Log.cs b/xFunc.Maths/Expressions/Log.cs
@@ -54,7 +54,7 @@ public override int GetHashCode()
         /// <returns>The string that represents this expression.</returns>
         public override string ToString()
         {
-            return ToString("log({1}, {0})");
+            return ToString("log({0}, {1})");
         }
 
         /// <summary>

diff --git a/xFunc.Test/Expressions/Maths/LogTest.cs b/xFunc.Test/Expressions/Maths/LogTest.cs
@@ -40,7 +40,7 @@ public void DerivativeTest2()
             Assert.AreEqual("1 / (x * ln(2))", deriv.ToString());
 
             num.Value = 4;
-            Assert.AreEqual("log(x, 4)", exp.ToString());
+            Assert.AreEqual("log(4, x)", exp.ToString());
             Assert.AreEqual("1 / (x * ln(2))", deriv.ToString());
         }
 

diff --git a/xFunc.Test/MathParserTest.cs b/xFunc.Test/MathParserTest.cs
@@ -63,8 +63,8 @@ public void ParseLog()
                 new SymbolToken(Symbols.CloseBracket)
             };
 
-            var exp = parser.Parse("log(3, 9)");
-            Assert.AreEqual("log(3, 9)", exp.ToString());
+            var exp = parser.Parse("log(9, 3)");
+            Assert.AreEqual("log(9, 3)", exp.ToString());
         }
 
         [TestMethod]

diff --git a/xFunc/Presenters/Updater.cs b/xFunc/Presenters/Updater.cs
@@ -26,7 +26,7 @@ internal class Updater
     {
 
         private const string checkUri = "http://xfunc.codeplex.com/releases/";
-        private const int currentRelease = 113720;
+        private const int currentRelease = 113947;
         private string updateUri;
         private bool hasUpdates;