Minor changes

dharmatech · Jun 8, 2019 · e10887d · e10887d
1 parent 5d66520
commit e10887d
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 51 deletions.
diff --git a/Symbolism/AlgebraicExpand.cs b/Symbolism/AlgebraicExpand.cs
@@ -22,10 +22,8 @@ public static MathObject AlgebraicExpand(this MathObject u)
                 }
 
                 if (u is Sum)
-                {
-                    return Sum.FromRange((u as Sum).elts.Select(elt => elt.AlgebraicExpand())).Simplify();
-                }
-
+                    return (u as Sum).Map(elt => elt.AlgebraicExpand());
+
                 if (u is Product)
                 {
                     var v = (u as Product).elts[0];

diff --git a/Symbolism/DeepSelect.cs b/Symbolism/DeepSelect.cs
@@ -14,12 +14,10 @@ public static MathObject DeepSelect(this MathObject obj, Func<MathObject, MathOb
                 var result = proc(obj);
 
                 if (result is Power)
-                {
                     return
                         (result as Power).bas.DeepSelect(proc) ^
                         (result as Power).exp.DeepSelect(proc);
-                }
-
+
                 if (result is Or)
                     return (result as Or).Map(elt => elt.DeepSelect(proc));
 
@@ -32,14 +30,14 @@ public static MathObject DeepSelect(this MathObject obj, Func<MathObject, MathOb
                             (result as Equation).a.DeepSelect(proc),
                             (result as Equation).b.DeepSelect(proc),
                             (result as Equation).Operator);
-                
+
                 if (result is Sum)
                     return
-                        Sum.FromRange((result as Sum).elts.Select(elt => elt.DeepSelect(proc))).Simplify();
+                        (result as Sum).Map(elt => elt.DeepSelect(proc));
 
                 if (result is Product)
                     return
-                        Product.FromRange((result as Product).elts.Select(elt => elt.DeepSelect(proc))).Simplify();
+                        (result as Product).Map(elt => elt.DeepSelect(proc));
 
                 return result;
             }

diff --git a/Symbolism/EliminateVariable.cs b/Symbolism/EliminateVariable.cs
@@ -52,7 +52,7 @@ public static MathObject CheckVariable(this MathObject expr, Symbol sym)
                 (((expr as Equation).SimplifyEquation() as Equation).a as Power).exp is Integer &&
                 ((((expr as Equation).SimplifyEquation() as Equation).a as Power).exp as Integer).val < 0)
                 return false;
-
+            
             if (expr is And)
             {
                 var result = (expr as And).Map(elt => elt.CheckVariable(sym));
@@ -67,16 +67,13 @@ public static MathObject CheckVariable(this MathObject expr, Symbol sym)
                 return result;
             }
 
-
             if (expr is Or &&
                 (expr as Or).args.All(elt => elt is And))
                 return (expr as Or).Map(elt => elt.CheckVariable(sym));
 
             return expr;
         }
 
-
-
         // EliminateVarAnd
         // EliminateVarOr
         // EliminateVarLs
@@ -162,7 +159,7 @@ public static MathObject EliminateVariable(this MathObject expr, Symbol sym)
             throw new Exception();
         }
 
-        public static MathObject EliminateVariables(this MathObject expr, params Symbol[] syms)
-        { return syms.Aggregate(expr, (result, sym) => result.EliminateVariable(sym)); }
+        public static MathObject EliminateVariables(this MathObject expr, params Symbol[] syms) => 
+            syms.Aggregate(expr, (result, sym) => result.EliminateVariable(sym));
     }
 }
diff --git a/Symbolism/RationalizeExpression.cs b/Symbolism/RationalizeExpression.cs
@@ -34,9 +34,8 @@ public static MathObject RationalizeExpression(this MathObject u)
 
                 if (u is Product)
                     return
-                        Product.FromRange((u as Product).elts.Select(elt => elt.RationalizeExpression())).Simplify();
-                        // (u as Product).Map(elt => elt.RationalizeExpression())
-
+                        (u as Product).Map(elt => elt.RationalizeExpression());
+
                 if (u is Sum)
                 {
                     var f = (u as Sum).elts[0];

diff --git a/Symbolism/Substitute.cs b/Symbolism/Substitute.cs
@@ -34,11 +34,11 @@ public static MathObject Substitute(this MathObject obj, MathObject a, MathObjec
 
                 if (obj is Product)
                     return
-                        Product.FromRange((obj as Product).elts.ConvertAll(elt => elt.Substitute(a, b))).Simplify();
+                        (obj as Product).Map(elt => elt.Substitute(a, b));
 
                 if (obj is Sum)
                     return
-                        Sum.FromRange((obj as Sum).elts.ConvertAll(elt => elt.Substitute(a, b))).Simplify();
+                        (obj as Sum).Map(elt => elt.Substitute(a, b));
 
                 if (obj is Function)
                 {
@@ -54,17 +54,17 @@ public static MathObject Substitute(this MathObject obj, MathObject a, MathObjec
                 return obj;
             }
 
-            public static MathObject SubstituteEq(this MathObject obj, Equation eq)
-            { return obj.Substitute(eq.a, eq.b); }
+            public static MathObject SubstituteEq(this MathObject obj, Equation eq) => 
+                obj.Substitute(eq.a, eq.b);
 
-            public static MathObject SubstituteEqLs(this MathObject obj, List<Equation> eqs)
-            { return eqs.Aggregate(obj, (a, eq) => a.SubstituteEq(eq)); }
+            public static MathObject SubstituteEqLs(this MathObject obj, List<Equation> eqs) => 
+                eqs.Aggregate(obj, (a, eq) => a.SubstituteEq(eq));
 
-            public static MathObject Substitute(this MathObject obj, MathObject a, int b)
-            { return obj.Substitute(a, new Integer(b)); }
+            public static MathObject Substitute(this MathObject obj, MathObject a, int b) => 
+                obj.Substitute(a, new Integer(b));
 
-            public static MathObject Substitute(this MathObject obj, MathObject a, double b)
-            { return obj.Substitute(a, new DoubleFloat(b)); }
+            public static MathObject Substitute(this MathObject obj, MathObject a, double b) => 
+                obj.Substitute(a, new DoubleFloat(b));
 
         }
     }

diff --git a/Symbolism/Symbolism.cs b/Symbolism/Symbolism.cs
@@ -699,19 +699,14 @@ static MathObject AndProc(MathObject[] ls)
 
         public static And FromRange(IEnumerable<MathObject> ls) => new And(ls.ToArray());
 
-        public MathObject Add(MathObject obj)
-        {
-            var ls = new List<MathObject>(args);
-
-            ls.Add(obj);
-
-            return And.FromRange(ls).Simplify();
-        }
+        public MathObject Add(MathObject obj) =>
+            And.FromRange(args.Add(obj)).Simplify();
 
         public MathObject AddRange(IEnumerable<MathObject> ls) =>
             And.FromRange(args.AddRange(ls)).Simplify();
-
-        public MathObject Map(Func<MathObject, MathObject> proc) => new And(args.Select(proc).ToArray()).Simplify();
+
+        public MathObject Map(Func<MathObject, MathObject> proc) => 
+            And.FromRange(args.Select(proc)).Simplify();
     }
 
     public class Or : Function
@@ -958,14 +953,8 @@ public MathObject Simplify()
             { return ((Power)v).bas ^ (((Power)v).exp * w); }
 
             if (v is Product && w is Integer)
-            {
-                var list = new List<MathObject>();
-
-                ((Product)v).elts.ForEach(elt => list.Add(elt ^ w));
-
-                return Product.FromRange(list).Simplify();
-            }
-
+                return (v as Product).Map(elt => elt ^ w);
+
             return new Power(v, w);
         }
 
@@ -1159,6 +1148,9 @@ public MathObject Simplify()
 
         public override MathObject Denominator() =>
             Product.FromRange(elts.Select(elt => elt.Denominator())).Simplify();
+
+        public MathObject Map(Func<MathObject, MathObject> proc) =>
+            Product.FromRange(elts.Select(proc)).Simplify();
     }
 
     public class Sum : MathObject
@@ -1317,6 +1309,9 @@ public override string StandardForm()
 
             return result;
         }
+
+        public MathObject Map(Func<MathObject, MathObject> proc) =>
+            Sum.FromRange(elts.Select(proc)).Simplify();
     }
 
     class Difference : MathObject

diff --git a/Symbolism/Trigonometric.cs b/Symbolism/Trigonometric.cs
@@ -430,12 +430,14 @@ public static class Extensions
     {
         public static Symbol Pi = new Symbol("Pi");
 
-        public static MathObject ToRadians(this MathObject n) { return n * Pi / 180; }
+        public static MathObject ToRadians(this MathObject n) => n * Pi / 180;
 
-        public static MathObject ToDegrees(this MathObject n) { return 180 * n / Pi; }
+        public static MathObject ToDegrees(this MathObject n) => 180 * n / Pi;
 
-        public static MathObject ToRadians(this int n) { return new Integer(n) * Pi / 180; }
+        public static MathObject ToRadians(this int n) => new Integer(n) * Pi / 180;
 
-        public static MathObject ToDegrees(this int n) { return 180 * new Integer(n) / Pi; }
+        public static MathObject ToDegrees(this int n) => 180 * new Integer(n) / Pi;
+
+        // (Integer) 180 * n / Pi
     }
 }