src/app/MathNet.Palladium/Settings.StyleCop @@ -1,5 +1,6 @@ *.suo *.user +*.Cache bin obj .svn .gitignore @@ -1,10 +1,41 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="Arithmetic.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + using System.Collections.Generic; using System.Linq; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { + /// <summary> + /// Arithmetic Expression Builder + /// </summary> public static class Arithmeric { public static Expression Zero() @@ -65,7 +96,6 @@ namespace MathNet.Palladium.ExpressionAlgebra public static Expression Multiply(params Expression[] terms) { - TypeInference type = new TypeInference(terms); List<Expression> factors = type.CastToMaxNumeric() .Where(x => !Elementary.IsConstantOne(x)) @@ -98,7 +128,11 @@ namespace MathNet.Palladium.ExpressionAlgebra public static Expression Invert(Expression term) { - // TODO: automatic simplification + if(term.NodeType == ExpressionType.Divide) + { + BinaryExpression binary = (BinaryExpression)term; + return Divide(binary.Right, binary.Left); + } return Divide(Expression.Constant(1), term); } @@ -106,7 +140,6 @@ namespace MathNet.Palladium.ExpressionAlgebra public static Expression Power(Expression a, Expression b) { // TODO: automatic simplification - TypeInference type = new TypeInference(a, b); List<Expression> expressions = type.CastToMaxNumericList(); return Expression.Power(expressions[0], expressions[1]); src/app/MathNet.Palladium/ExpressionAlgebra/Arithmeric.cs @@ -1,11 +1,39 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; +//----------------------------------------------------------------------- +// <copyright file="AutoSimplify.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { + /// <summary> + /// Automatic Algebraic Expression Simplification. + /// </summary> public static class AutoSimplify { /// <summary> src/app/MathNet.Palladium/ExpressionAlgebra/AutoSimplify.cs @@ -1,8 +1,37 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="Elementary.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Collections.Generic; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { using MathNet.Numerics; src/app/MathNet.Palladium/ExpressionAlgebra/Elementary.cs @@ -1,7 +1,36 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="Exponential.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { public static class Exponential { src/app/MathNet.Palladium/ExpressionAlgebra/Exponential.cs @@ -1,9 +1,38 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="ExpressionBuilder.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Collections.Generic; using System.Linq.Expressions; using System.Reflection; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { internal static class ExpressionBuilder { src/app/MathNet.Palladium/ExpressionAlgebra/ExpressionBuilder.cs @@ -1,9 +1,38 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="PartialDerivative.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { - using MathNet.Palladium.ExpressionAlgebra.Visitors; + using MathNet.ExpressionAlgebra.Visitors; /// <remarks> /// This class is stateful and not thread safe, therefore never share an instance @@ -43,8 +72,8 @@ namespace MathNet.Palladium.ExpressionAlgebra protected override Expression VisitMultiply(BinaryExpression binaryExpression) { - Expression leftDerivative = base.Visit(binaryExpression.Left); - Expression rightDerivative = base.Visit(binaryExpression.Right); + Expression leftDerivative = Visit(binaryExpression.Left); + Expression rightDerivative = Visit(binaryExpression.Right); return Arithmeric.Add( Arithmeric.Multiply(leftDerivative, binaryExpression.Right), Arithmeric.Multiply(rightDerivative, binaryExpression.Left)); @@ -52,8 +81,8 @@ namespace MathNet.Palladium.ExpressionAlgebra protected override Expression VisitDivide(BinaryExpression binaryExpression) { - Expression leftDerivative = base.Visit(binaryExpression.Left); - Expression rightDerivative = base.Visit(binaryExpression.Right); + Expression leftDerivative = Visit(binaryExpression.Left); + Expression rightDerivative = Visit(binaryExpression.Right); return Arithmeric.Subtract( Arithmeric.Divide(leftDerivative, binaryExpression.Right), Arithmeric.Divide( @@ -63,8 +92,8 @@ namespace MathNet.Palladium.ExpressionAlgebra protected override Expression VisitPower(BinaryExpression binaryExpression) { - Expression leftDerivative = base.Visit(binaryExpression.Left); - Expression rightDerivative = base.Visit(binaryExpression.Right); + Expression leftDerivative = Visit(binaryExpression.Left); + Expression rightDerivative = Visit(binaryExpression.Right); return Arithmeric.Multiply( binaryExpression, Arithmeric.Add( @@ -83,24 +112,25 @@ namespace MathNet.Palladium.ExpressionAlgebra case "Sin": case "Sine": { - Expression innerDerivative = base.Visit(m.Arguments[0]); + Expression innerDerivative = Visit(m.Arguments[0]); return Arithmeric.Multiply( innerDerivative, Trigonometry.Cosine(m.Arguments[0])); } + case "Cos": case "Cosine": { - Expression innerDerivative = base.Visit(m.Arguments[0]); + Expression innerDerivative = Visit(m.Arguments[0]); return Arithmeric.Negate( Arithmeric.Multiply( innerDerivative, Trigonometry.Sine(m.Arguments[0]))); } + default: throw new NotSupportedException(String.Format("Method Call to {0} is not supported.", m.ToString())); } - } } } src/app/MathNet.Palladium/ExpressionAlgebra/PartialDerivative.cs @@ -1,10 +1,42 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="Trigonometry.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { using MathNet.Numerics; + /// <summary> + /// Trigonometric Expression Builder + /// </summary> public static class Trigonometry { static readonly Type _trigType = typeof(Trig); src/app/MathNet.Palladium/ExpressionAlgebra/Trigonometry.cs @@ -1,10 +1,38 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="TypeInference.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Collections.Generic; using System.Linq; -using System.Text; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra +namespace MathNet.ExpressionAlgebra { internal class TypeInference { @@ -66,7 +94,7 @@ namespace MathNet.Palladium.ExpressionAlgebra public static Type MaxNumeric(IEnumerable<Type> types) { - Type max = typeof(Int32); + Type max = typeof(int); foreach(Type type in types) { src/app/MathNet.Palladium/ExpressionAlgebra/TypeInference.cs @@ -1,6 +1,35 @@ -using System.Linq.Expressions; - -namespace MathNet.Palladium.ExpressionAlgebra.Visitors +//----------------------------------------------------------------------- +// <copyright file="AlgebraicVisitor.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System.Linq.Expressions; + +namespace MathNet.ExpressionAlgebra.Visitors { /// <summary> /// Alebraic Linq Expression Visitor Base @@ -107,7 +136,6 @@ namespace MathNet.Palladium.ExpressionAlgebra.Visitors protected virtual Expression VisitPower(BinaryExpression term) { - Expression newLeft = Visit(term.Left); Expression newRight = Visit(term.Right); if(newLeft != term.Left || newRight != term.Right) src/app/MathNet.Palladium/ExpressionAlgebra/Visitors/AlgebraicVisitor.cs @@ -1,9 +1,38 @@ -using System; +//----------------------------------------------------------------------- +// <copyright file="ExpressionVisitor.cs" company="Math.NET Project"> +// Copyright (c) 2002-2009, Christoph Rüegg. +// All Right Reserved. +// </copyright> +// <author> +// Christoph Rüegg, http://christoph.ruegg.name +// </author> +// <product> +// Math.NET Palladium, part of the Math.NET Project. +// http://mathnet.opensourcedotnet.info +// </product> +// <license type="opensource" name="LGPL" version="2 or later"> +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2 of the License, or +// any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this program; if not, write to the Free Software +// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +// </license> +//----------------------------------------------------------------------- + +using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq.Expressions; -namespace MathNet.Palladium.ExpressionAlgebra.Visitors +namespace MathNet.ExpressionAlgebra.Visitors { /// <summary> /// Linq Expression Visitor Base @@ -138,9 +167,13 @@ namespace MathNet.Palladium.ExpressionAlgebra.Visitors if(left != b.Left || right != b.Right || conversion != b.Conversion) { if(b.NodeType == ExpressionType.Coalesce && b.Conversion != null) + { return Expression.Coalesce(left, right, conversion as LambdaExpression); + } else + { return Expression.MakeBinary(b.NodeType, left, right, b.IsLiftedToNull, b.Method); + } } return b; @@ -222,6 +255,7 @@ namespace MathNet.Palladium.ExpressionAlgebra.Visitors { list.Add(original[j]); } + list.Add(p); } } @@ -285,6 +319,7 @@ namespace MathNet.Palladium.ExpressionAlgebra.Visitors { list.Add(original[j]); } + list.Add(b); } } @@ -314,6 +349,7 @@ namespace MathNet.Palladium.ExpressionAlgebra.Visitors { list.Add(original[j]); } + list.Add(init); } } src/app/MathNet.Palladium/ExpressionAlgebra/Visitors/ExpressionVisitor.cs @@ -8,7 +8,7 @@ <ProjectGuid>{96F70E7A-18FD-4A26-B833-797791DC761A}</ProjectGuid> <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>MathNet.Palladium</RootNamespace> + <RootNamespace>MathNet.ExpressionAlgebra</RootNamespace> <AssemblyName>MathNet.Palladium</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> src/app/MathNet.Palladium/MathNet.Palladium.csproj @@ -4,7 +4,7 @@ using NUnit.Framework; namespace MathNet.Palladium.Test { - using MathNet.Palladium.ExpressionAlgebra; + using MathNet.ExpressionAlgebra; [TestFixture] public class DifferentiationTests src/test/MathNet.Palladium.Test/DifferentiationTests.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; using NUnit.Framework; namespace MathNet.Palladium.Test { + using MathNet.ExpressionAlgebra; using MathNet.Numerics; - using MathNet.Palladium.ExpressionAlgebra; [TestFixture] public class ExpressionAlgebraElementaryTests src/test/MathNet.Palladium.Test/ExpressionAlgebraElementaryTests.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Linq.Expressions; -using System.Text; using NUnit.Framework; namespace MathNet.Palladium.Test { - using MathNet.Palladium.ExpressionAlgebra; + using MathNet.ExpressionAlgebra; [TestFixture] public class ExpressionAlgebraSimplifyTests src/test/MathNet.Palladium.Test/ExpressionAlgebraSimplifyTests.cs 19ca520d9bcdccabdb3ce8ca513d49422cf6024d Christoph Ruegg git@cdrnet.ch http://github.com/cdrnet/mathnet-palladium/commit/f0d58676a88b12c636ed49a0248fb0b68ed3fecc f0d58676a88b12c636ed49a0248fb0b68ed3fecc 2009-01-26T07:43:01-08:00 2009-01-26T07:43:01-08:00 headers, namespaces, StyleCop 13e9beecda27b843cd1747c3c64bc602562d99a7 Christoph Ruegg git@cdrnet.ch