This is an automated email from the git hooks/post-receive script.

ppm-guest pushed a commit to annotated tag v0.33
in repository libmath-prime-util-perl.

commit e104357fe8c3d45c4f408bc10374ba0b5d12d043
Author: Dana Jacobsen <d...@acm.org>
Date:   Wed Oct 23 19:52:48 2013 -0700

    Zeta accuracy test in xt/
---
 MANIFEST                            |  1 +
 lib/Math/Prime/Util/PP.pm           |  2 +-
 lib/Math/Prime/Util/ZetaBigFloat.pm | 11 ++++----
 xt/measure_zeta_accuracy.pl         | 52 +++++++++++++++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/MANIFEST b/MANIFEST
index 07f5c07..c302ac8 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -103,6 +103,7 @@ xt/primality-proofs.pl
 xt/small-is-next-prev.pl
 xt/factor-holf.pl
 xt/make-script-test-data.pl
+xt/measure_zeta_accuracy.pl
 xt/pari-totient-moebius.pl
 xt/primes-edgecases.pl
 xt/rwh_primecount.py
diff --git a/lib/Math/Prime/Util/PP.pm b/lib/Math/Prime/Util/PP.pm
index 0e32535..115df8a 100644
--- a/lib/Math/Prime/Util/PP.pm
+++ b/lib/Math/Prime/Util/PP.pm
@@ -2358,7 +2358,7 @@ sub RiemannZeta {
       $xdigits = $x->accuracy || Math::BigFloat->accuracy() || 
Math::BigFloat->div_scale();
     }
     my $rnd = 0;  # MPFR_RNDN;
-    my $bit_precision = int($xdigits * 3.322) + 4;
+    my $bit_precision = int($xdigits * 3.322) + 5;
     my $rx = Math::MPFR->new();
     Math::MPFR::Rmpfr_set_prec($rx, $bit_precision);
     Math::MPFR::Rmpfr_set_str($rx, "$x", 10, $rnd);
diff --git a/lib/Math/Prime/Util/ZetaBigFloat.pm 
b/lib/Math/Prime/Util/ZetaBigFloat.pm
index b76e3e1..308d7f5 100644
--- a/lib/Math/Prime/Util/ZetaBigFloat.pm
+++ b/lib/Math/Prime/Util/ZetaBigFloat.pm
@@ -291,10 +291,11 @@ sub RiemannZeta {
                                          : Math::BigFloat->new("$ix");
   my $xdigits = $x->accuracy || Math::BigFloat->accuracy() || 
Math::BigFloat->div_scale();
 
-  return $_Riemann_Zeta_Table[int($x)-2]
-       if $x == int($x)
-       && defined $_Riemann_Zeta_Table[int($x)-2]
-       && $xdigits <= 44;
+  if ($x == int($x) && $xdigits <= 44 && (int($x)-2) <= $#_Riemann_Zeta_Table) 
{
+    my $izeta = $_Riemann_Zeta_Table[int($x)-2]->copy;
+    $izeta->bround($xdigits);
+    return $izeta;
+  }
 
   my $extra_acc = 7;
   if    ($x > 50) { $extra_acc = 10; }
@@ -317,7 +318,7 @@ sub RiemannZeta {
   # We can fix some issues with large exponents (e.g. 6^-40.5) by turning it
   # into (6^-(40.5/4))^4  (assuming the base is positive).  Without that hack,
   # none of this would work at all.
-  # Even with the fix, it turns out this is significantly faster.
+  # There is a fix for the defect in the RT.
 
   my $superx = Math::BigInt->bone;
   my $subx = $x->copy;
diff --git a/xt/measure_zeta_accuracy.pl b/xt/measure_zeta_accuracy.pl
new file mode 100644
index 0000000..7c395f2
--- /dev/null
+++ b/xt/measure_zeta_accuracy.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/env perl
+use warnings;
+use strict;
+use Math::BigInt lib=>'GMP';
+use Math::BigFloat lib=>'GMP';
+use Math::Prime::Util qw/:all/;
+use Term::ANSIColor;
+use feature 'say';
+
+my $acc = 40;
+
+# gp
+# \p 200
+# zeta( ... )
+
+my %rvals = (
+  '1.1' => 
'9.584448464950809826386400791735523039948452821749956287341996814480303837459322691616078413409515648694639395119228819064344703916091772977408730498635107285330892384233095746851896144943768106376250',
+  '1.5' => 
'1.6123753486854883433485675679240716305708006524000634075733282488149277676882728609962438681263119523829763587721497556981576329684344591344383205618083360083393339628054805416629485268482979816864585',
+  '2' => 
'0.6449340668482264364724151666460251892189499012067984377355582293700074704032008738336289006197587053040043189623371906796287246870050077879351029463308662768317333093677626050952510068721400547968116',
+  '10.6' => 
'0.0006535124140849160091501143426339766925221571365653473384612636596703480872941784752196831016776418120994086666918881480106625093513591339409876063582144423806112461223442629387528335045020747185807',
+  '40' => 
'0.0000000000009094947840263889282533118386949087538600009908788285054797101120253686956071035306072205287331384902727431401990215047047204991063494101565431604021268515739713441458101750970056651490623',
+  '40.5' => 
'0.0000000000006431099185658679387082225425519898498591882791889454081987607830570099179633851971961276745357473820567338532744684721389592539881397336120645131348781330604831257993490233960843733407184',
+  '80' => 
'0.0000000000000000000000008271806125530344403671105616744072404009681112297828911634240702948673833268263801251794903859145412800678073752551076032591373513167395826219721614628514247211772783817197087',
+  '200' => 
'0.0000000000000000000000000000000000000000000000000000000000006223015277861141707144064053780124278238871664711431331935339387492776093057166188727575094880097645495454472391197851568776550275806071517',
+);
+
+foreach my $vstr (sort { $a <=> $b } keys %rvals) {
+  my $zeta_str = $rvals{$vstr};
+  my $lead = index($zeta_str, '.');
+  my $v    = Math::BigFloat->new($vstr);
+  my $zeta = Math::BigFloat->new($rvals{$vstr});
+  $v->accuracy($acc) if defined $acc && $acc != 40;
+  #print "zeta($v) = $zeta\n";
+  my $mpuzeta = RiemannZeta($v);
+  my $mpuzeta_str = ref($mpuzeta) eq 'Math::BigFloat'
+                    ? $mpuzeta->bstr
+                    : sprintf("%.69Lf", $mpuzeta);
+  my $mzlen = length($mpuzeta_str);
+  # Truncate zeta_str to length of mpuzeta_str, with rounding.
+  {
+    $zeta_str = Math::BigFloat->new($zeta_str)->bmul(1,$acc||40)->bstr;
+  }
+  if ($zeta_str ne $mpuzeta_str) {
+    my $n = 0;
+    $n++ while substr($zeta_str, $n, 1) eq substr($mpuzeta_str, $n, 1);
+    $mpuzeta_str = substr($mpuzeta_str, 0, $n)
+                   . colored(substr($mpuzeta_str, $n), "red");
+  }
+  printf "%5.1f %s\n", $v, $zeta_str;
+  printf "      %s\n", $mpuzeta_str;
+  print "\n";
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-perl/packages/libmath-prime-util-perl.git

_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits

Reply via email to