Tweak to problem 70

ckknight · Jun 8, 2010 · ed587a8 · ed587a8
1 parent 6ed5d10
commit ed587a8
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/Ckknight.ProjectEuler/Problems/Problem070.cs b/Ckknight.ProjectEuler/Problems/Problem070.cs
@@ -36,16 +36,15 @@ public override object CalculateResult()
                     n = x.n,
                     t = x.n - (x.p + x.q) + 1
                 })
+                .Concat(PrimeGenerator.Instance.AsParallel((long)Math.Sqrt(10000000))
+                    .Select(p => new
+                    {
+                        n = p*p,
+                        t = p*p - p,
+                    }))
                 .Where(x => MathUtilities.ToDigits(x.t).IsPermutation(MathUtilities.ToDigits(x.n)))
                 .WithMin(x => (double)x.n / (double)x.t)
                 .n;
         }
-
-        public long Phi(long n)
-        {
-            return new PrimeFactorGenerator(n)
-                .Distinct()
-                .Aggregate(n, (x, p) => x * (p - 1) / p);
-        }
     }
 }