...
 
Commits (9)
lcalc (1.23+dfsg-6) unstable; urgency=medium
[ Tobias Hansen ]
* Apply two patches to allow building with PARI 2.9. (Closes: #841738)
* Bump Standards-Version to 3.9.8.
[ Julien Puydt ]
* Refresh packaging:
- Use my debian.org mail address.
- Bump d/watch to version 4.
- Bump dh compat to 11.
- Bump std-ver to 4.1.5.
- Point Vcs-* fields to salsa.
- Mark the -dev package Multi-Arch: same.
- Put the lib package in section libs.
* Add a patch for clang compilation (Closes: #748898).
* Add a patch to fix spelling issues.
-- Tobias Hansen <thansen@debian.org> Sun, 23 Oct 2016 19:10:37 +0100
lcalc (1.23+dfsg-5) unstable; urgency=medium
......
......@@ -2,12 +2,12 @@ Source: lcalc
Section: math
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers@lists.alioth.debian.org>
Uploaders: Tobias Hansen <thansen@debian.org>, Julien Puydt <julien.puydt@laposte.net>
Build-Depends: debhelper (>= 9), libpari-dev (>= 2.7)
Uploaders: Tobias Hansen <thansen@debian.org>, Julien Puydt <jpuydt@debian.org>
Build-Depends: debhelper (>= 11), libpari-dev (>= 2.7)
Homepage: http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html
Standards-Version: 3.9.8
Vcs-Git: git://anonscm.debian.org/debian-science/packages/lcalc.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/lcalc.git;a=summary
Standards-Version: 4.1.5
Vcs-Git: https://salsa.debian.org/science-team/lcalc.git
Vcs-Browser: https://salsa.debian.org/science-team/lcalc
Package: lcalc
Architecture: any
......@@ -19,6 +19,7 @@ Description: program for calculating with L-functions
of elliptic curves defined over the rationals.
Package: liblfunction0
Section: libs
Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
......@@ -32,6 +33,7 @@ Description: library for calculating with L-functions
Package: liblfunction-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, liblfunction0 (= ${binary:Version})
Description: development files for liblfunction
liblfunction is a library for computing zeros and values of L-functions.
......
Author: François Bissey
Description: make it build with clang
Forwarded: comes from sagemath, see https://trac.sagemath.org/ticket/12437
--- a/include/Lcomplex.h
+++ b/include/Lcomplex.h
@@ -45,8 +45,6 @@
#pragma GCC system_header
-#include <bits/c++config.h>
-
//no longer include:
//#include <bits/cpp_type_traits.h> only thing used was is_floating...
//gcc 4.0 cpp_type_traits.h is not compatible with gcc 3.3.
@@ -135,7 +133,7 @@
template<typename _Up>
complex<_Tp>& operator/=(const complex<_Up>&);
- friend reset(complex<_Tp>& C) {
+ friend void reset(complex<_Tp>& C) {
reset(C._M_real);
reset(C._M_imag);
}
--- a/include/Ldokchitser.h
+++ b/include/Ldokchitser.h
@@ -69,7 +69,7 @@
// compute the values m[j] for the respective lambda_k[j]
- Complex m[N+1];
+ std::vector<Complex> m(N+1);
for (j=1;j<=N;j++)
m[j] = -2*lambda_k[j] + 2;
@@ -78,7 +78,8 @@
int n,fact_n;
Complex log_Gamma[N+1][a+1][MYDIGITS+1];
- Complex sum_log_Gamma[N+1][MYDIGITS+1];
+ std:vector<std::vector<Complex> > sum_log_Gamma(N+1);
+ for (j=1;j<=N;j++) sum_log_Gamma[j].resize(MYDIGITS+1);
for (j=1;j<=N;j++)
for (n=0;n<=MYDIGITS;n++)
@@ -103,8 +104,13 @@
// compute the exponential taylor series for gamma = exp(sum_log_Gamma)
- Complex exp_sum_log_Gamma[N+1][MYDIGITS+1][MYDIGITS+1]; // symmetric functions
- Complex gamma[N+1][MYDIGITS+1]; // gamma(s+m[j]) for j = 1 to N
+ std::vector<std::vector<std::vector<Complex> > > exp_sum_log_Gamma(N+1); // symmetric functions
+ std::vector<std::vector<Complex> > gamma(N+1); // gamma(s+m[j]) for j = 1 to N
+ for (j=1;j<=N;j++){
+ exp_sum_log_Gamma[j].resize(MYDIGITS+1);
+ gamma[j].resize(MYDIGITS+1);
+ }
+ for (j=1;j<=N;j++) for (n=0;n<=MYDIGITS;n++) exp_sum_log_Gamma[j][n].resize(MYDIGITS+1);
Complex temp_gamma[MYDIGITS+1];
Complex temp_mult_gamma[MYDIGITS+1];
Complex temp_exp_sum_log_Gamma[MYDIGITS+1];
--- a/include/Lexplicit_formula.h
+++ b/include/Lexplicit_formula.h
@@ -25,7 +25,7 @@
dirichlet_coeffs_log_diff(int num_coeffs, Complex *c)
{
- Complex b[num_coeffs+1];
+ std::vector<Complex> b(num_coeffs+1);
int j, n, d1, ind;
Complex total, total2, temp;
......@@ -7,3 +7,5 @@ init_stack.patch
lcalc-1.23_default_parameters_2.patch
pari-apell.patch
pari-init-stack.patch
clang.patch
spelling.patch
Author: Julien Puydt
Description: fix spelling mistakes
Forwarded: yes (private mail)
--- a/include/cmdline.h
+++ b/include/cmdline.h
@@ -34,8 +34,8 @@
{
const char *help_help; /**< @brief Print help and exit help description. */
const char *version_help; /**< @brief Print version and exit help description. */
- int value_flag; /**< @brief compute L-function at x+iy. Should be used in conjuction with x and y options (default=off). */
- const char *value_help; /**< @brief compute L-function at x+iy. Should be used in conjuction with x and y options help description. */
+ int value_flag; /**< @brief compute L-function at x+iy. Should be used in conjunction with x and y options (default=off). */
+ const char *value_help; /**< @brief compute L-function at x+iy. Should be used in conjunction with x and y options help description. */
char * x_arg; /**< @brief Used with value,value-line-segment, and zeros-interval options (default='.5'). */
char * x_orig; /**< @brief Used with value,value-line-segment, and zeros-interval options original value given at command line. */
const char *x_help; /**< @brief Used with value,value-line-segment, and zeros-interval options help description. */
@@ -145,9 +145,9 @@
const char *twist_complex_no_conj_pairs_help; /**< @brief twist by all complex primitive Dirichlet characters with start <= conductor <= finish. For L-functions with complex Dirichlet coefficients, conjugate pairs of characters are considered equivalent help description. */
int twist_generic_flag; /**< @brief twist by a generic complex Dirichlet characters with start <= conductor <= finish. (default=off). */
const char *twist_generic_help; /**< @brief twist by a generic complex Dirichlet characters with start <= conductor <= finish. help description. */
- int degree_arg; /**< @brief can only be used in conjuction with twist-primitive (?). Select characters of specified degree. Not yet implemented. */
- char * degree_orig; /**< @brief can only be used in conjuction with twist-primitive (?). Select characters of specified degree. Not yet implemented original value given at command line. */
- const char *degree_help; /**< @brief can only be used in conjuction with twist-primitive (?). Select characters of specified degree. Not yet implemented help description. */
+ int degree_arg; /**< @brief can only be used in conjunction with twist-primitive (?). Select characters of specified degree. Not yet implemented. */
+ char * degree_orig; /**< @brief can only be used in conjunction with twist-primitive (?). Select characters of specified degree. Not yet implemented original value given at command line. */
+ const char *degree_help; /**< @brief can only be used in conjunction with twist-primitive (?). Select characters of specified degree. Not yet implemented help description. */
int openmp_arg; /**< @brief whether to use openmp parallelization (beta- very little parallelization currently implemented) . Specify the number of threads to use.. */
char * openmp_orig; /**< @brief whether to use openmp parallelization (beta- very little parallelization currently implemented) . Specify the number of threads to use. original value given at command line. */
const char *openmp_help; /**< @brief whether to use openmp parallelization (beta- very little parallelization currently implemented) . Specify the number of threads to use. help description. */
--- a/src/Lcommandline.ggo
+++ b/src/Lcommandline.ggo
@@ -2,7 +2,7 @@
version "1.22 July 14, 2009"
purpose "This program computes zeros and values of L-function."
-option "value" v "compute L-function at x+iy. Should be used in conjuction with x and y options" flag off
+option "value" v "compute L-function at x+iy. Should be used in conjunction with x and y options" flag off
option "x" x "Used with value,value-line-segment, and zeros-interval options" string typestr="Double" default=".5" no
option "y" y "Used with value,value-line-segment, and zeros-interval options" string typestr="Double" default="0" no
option "value-file" - "compute L-function at points specified in file" string typestr="filename" no
@@ -44,6 +44,6 @@
option "twist-all-no-conj-pairs" a "twist by all Dirichlet characters with start <= conductor <= finish. For L-functions with complex Dirichlet coefficients, conjugate pairs of characters are considered equivalent" flag off
option "twist-complex-no-conj-pairs" c "twist by all complex primitive Dirichlet characters with start <= conductor <= finish. For L-functions with complex Dirichlet coefficients, conjugate pairs of characters are considered equivalent" flag off
option "twist-generic" g "twist by a generic complex Dirichlet characters with start <= conductor <= finish." flag off
-option "degree" D "can only be used in conjuction with twist-primitive (?). Select characters of specified degree. Not yet implemented" int typestr="degree" no
+option "degree" D "can only be used in conjunction with twist-primitive (?). Select characters of specified degree. Not yet implemented" int typestr="degree" no
option "openmp" O "whether to use openmp parallelization (beta- very little parallelization currently implemented) . Specify the number of threads to use." int no
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -30,7 +30,7 @@
const char *gengetopt_args_info_help[] = {
" -h, --help Print help and exit",
" -V, --version Print version and exit",
- " -v, --value compute L-function at x+iy. Should be used in \n conjuction with x and y options \n (default=off)",
+ " -v, --value compute L-function at x+iy. Should be used in \n conjunction with x and y options \n (default=off)",
" -x, --x=Double Used with value,value-line-segment, and \n zeros-interval options (default=`.5')",
" -y, --y=Double Used with value,value-line-segment, and \n zeros-interval options (default=`0')",
" --value-file=filename compute L-function at points specified in file",
@@ -72,7 +72,7 @@
" -a, --twist-all-no-conj-pairs twist by all Dirichlet characters with start <= \n conductor <= finish. For L-functions with \n complex Dirichlet coefficients, conjugate \n pairs of characters are considered equivalent \n (default=off)",
" -c, --twist-complex-no-conj-pairs\n twist by all complex primitive Dirichlet \n characters with start <= conductor <= finish. \n For L-functions with complex Dirichlet \n coefficients, conjugate pairs of characters \n are considered equivalent (default=off)",
" -g, --twist-generic twist by a generic complex Dirichlet characters \n with start <= conductor <= finish. \n (default=off)",
- " -D, --degree=degree can only be used in conjuction with \n twist-primitive (?). Select characters of \n specified degree. Not yet implemented",
+ " -D, --degree=degree can only be used in conjunction with \n twist-primitive (?). Select characters of \n specified degree. Not yet implemented",
" -O, --openmp=INT whether to use openmp parallelization (beta- \n very little parallelization currently \n implemented) . Specify the number of threads \n to use.",
0
};
@@ -884,7 +884,7 @@
cmdline_parser_free (&local_args_info);
exit (EXIT_SUCCESS);
- case 'v': /* compute L-function at x+iy. Should be used in conjuction with x and y options. */
+ case 'v': /* compute L-function at x+iy. Should be used in conjunction with x and y options. */
if (update_arg((void *)&(args_info->value_flag), 0, &(args_info->value_given),
@@ -1198,7 +1198,7 @@
goto failure;
break;
- case 'D': /* can only be used in conjuction with twist-primitive (?). Select characters of specified degree. Not yet implemented. */
+ case 'D': /* can only be used in conjunction with twist-primitive (?). Select characters of specified degree. Not yet implemented. */
if (update_arg( (void *)&(args_info->degree_arg),
--- a/src/Lriemannsiegel_blfi.cc
+++ b/src/Lriemannsiegel_blfi.cc
@@ -1072,7 +1072,7 @@
Double bl_ratio=input_mean_spacing/approx_blfi_mean_spacing;
if(bl_ratio>0.5){
- cout<<"Error: mean seperation of input points is too large!"<<"\n";
+ cout<<"Error: mean separation of input points is too large!"<<"\n";
clean_arrays(0);
return 0;
}
#!/usr/bin/make -f
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
include /usr/share/dpkg/architecture.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
%:
dh $@ --sourcedirectory=src --parallel
dh $@ --sourcedirectory=src
override_dh_auto_build:
dh_auto_build -- PARI_DEFINE=-DINCLUDE_PARI
......
version=3
version=4
opts=dversionmangle=s/\+dfsg$// \
http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-(.+).tar.gz \
debian sh debian/repack.stub