From 83c4d7ff1c815395eb050aa6b16b6b740595cc92 Mon Sep 17 00:00:00 2001 From: John Darrington Date: Sun, 20 Jul 2008 20:25:15 +0800 Subject: [PATCH] Why does git only commit some of the changes if you don't pass the -a flag? --- configure.ac | 2 +- lib/ChangeLog | 5 +++++ lib/automake.mk | 1 - src/language/expressions/helpers.c | 2 +- src/language/expressions/helpers.h | 1 - src/language/expressions/operations.def | 12 ++++++------ src/language/stats/binomial.c | 3 +-- src/ui/gui/automake.mk | 1 - src/ui/terminal/automake.mk | 1 - 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index f38aafbc..f36dcac2 100644 --- a/configure.ac +++ b/configure.ac @@ -128,7 +128,7 @@ fi AM_CONDITIONAL(WITH_GUI_TOOLS, test x"$with_gui_tools" = x"yes") AC_SEARCH_LIBS([cblas_dsdot], [gslcblas],,[PSPP_REQUIRED_PREREQ([libgslcblas])]) -AC_SEARCH_LIBS([gsl_cdf_chisq_Q], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.4 or later)])]) +AC_SEARCH_LIBS([gsl_cdf_binomial_P], [gsl],,[PSPP_REQUIRED_PREREQ([libgsl (version 1.8 or later)])]) PSPP_GSL_NEEDS_FGNU89_INLINE dnl Recent versions of GNU ncurses install the curses header files into diff --git a/lib/ChangeLog b/lib/ChangeLog index 44bff7c1..28c767bd 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2008/07/20 John Darrington + + * Removed gsl-extras. Functionality now + available in gsl. + Sun Jul 31 11:29:04 2005 Ben Pfaff * misc/: Removed in favor of gnulib. diff --git a/lib/automake.mk b/lib/automake.mk index 3afc9e1a..440a8595 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -1,7 +1,6 @@ ## Process this file with automake to produce Makefile.in -*- makefile -*- include $(top_srcdir)/lib/linreg/automake.mk -include $(top_srcdir)/lib/gsl-extras/automake.mk if WITHGUI include $(top_srcdir)/lib/gtksheet/automake.mk diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c index 59b88fc8..695c2335 100644 --- a/src/language/expressions/helpers.c +++ b/src/language/expressions/helpers.c @@ -596,7 +596,7 @@ cdf_bvnor (double x0, double x1, double r) double idf_fdist (double P, double df1, double df2) { - double temp = gslextras_cdf_beta_Pinv (P, df1 / 2, df2 / 2); + double temp = gsl_cdf_beta_Pinv (P, df1 / 2, df2 / 2); return temp * df2 / ((1. - temp) * df1); } diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h index 23ca315a..447a6b82 100644 --- a/src/language/expressions/helpers.h +++ b/src/language/expressions/helpers.h @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def index 2ec03c34..ea640e18 100644 --- a/src/language/expressions/operations.def +++ b/src/language/expressions/operations.def @@ -647,7 +647,7 @@ function PDF.BETA (x >= 0 && x <= 1, a > 0, b > 0) = gsl_ran_beta_pdf (x, a, b); function CDF.BETA (x >= 0 && x <= 1, a > 0, b > 0) = gsl_cdf_beta_P (x, a, b); function IDF.BETA (P >= 0 && P <= 1, a > 0, b > 0) - = gslextras_cdf_beta_Pinv (P, a, b); + = gsl_cdf_beta_Pinv (P, a, b); no_opt function RV.BETA (a > 0, b > 0) = gsl_ran_beta (get_rng (), a, b); function NCDF.BETA (x >= 0, a > 0, b > 0, lambda > 0) = ncdf_beta (x, a, b, lambda); @@ -850,7 +850,7 @@ no_opt function RV.BERNOULLI (p >= 0 && p <= 1) // Binomial distribution. function CDF.BINOM (k, n > 0 && n == floor (n), p >= 0 && p <= 1) - = gslextras_cdf_binomial_P (k, p, n); + = gsl_cdf_binomial_P (k, p, n); function PDF.BINOM (k >= 0 && k == floor (k) && k <= n, n > 0 && n == floor (n), p >= 0 && p <= 1) @@ -860,7 +860,7 @@ no_opt function RV.BINOM (p > 0 && p == floor (p), n >= 0 && n <= 1) // Geometric distribution. function CDF.GEOM (k >= 1 && k == floor (k), p >= 0 && p <= 1) - = gslextras_cdf_geometric_P (k, p); + = gsl_cdf_geometric_P (k, p); function PDF.GEOM (k >= 1 && k == floor (k), p >= 0 && p <= 1) = gsl_ran_geometric_pdf (k, p); @@ -871,7 +871,7 @@ function CDF.HYPER (k >= 0 && k == floor (k) && k <= c, a > 0 && a == floor (a), b > 0 && b == floor (b) && b <= a, c > 0 && c == floor (c) && c <= a) - = gslextras_cdf_hypergeometric_P (k, c, a - c, b); + = gsl_cdf_hypergeometric_P (k, c, a - c, b); function PDF.HYPER (k >= 0 && k == floor (k) && k <= c, a > 0 && a == floor (a), b > 0 && b == floor (b) && b <= a, @@ -890,7 +890,7 @@ no_opt extension function RV.LOG (p > 0 && p <= 1) // Negative binomial distribution. function CDF.NEGBIN (k >= 1, n == floor (n), p > 0 && p <= 1) - = gslextras_cdf_negative_binomial_P (k, p, n); + = gsl_cdf_negative_binomial_P (k, p, n); function PDF.NEGBIN (k >= 1, n == floor (n), p > 0 && p <= 1) = gsl_ran_negative_binomial_pdf (k, p, n); no_opt function RV.NEGBIN (n == floor (n), p > 0 && p <= 1) @@ -898,7 +898,7 @@ no_opt function RV.NEGBIN (n == floor (n), p > 0 && p <= 1) // Poisson distribution. function CDF.POISSON (k >= 0 && k == floor (k), mu > 0) - = gslextras_cdf_poisson_P (k, mu); + = gsl_cdf_poisson_P (k, mu); function PDF.POISSON (k >= 0 && k == floor (k), mu > 0) = gsl_ran_poisson_pdf (k, mu); no_opt function RV.POISSON (mu > 0) = gsl_ran_poisson (get_rng (), mu); diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c index 39b8506d..d9209f1b 100644 --- a/src/language/stats/binomial.c +++ b/src/language/stats/binomial.c @@ -41,7 +41,6 @@ #include #include -#include #include @@ -79,7 +78,7 @@ calculate_binomial_internal (double n1, double n2, double p) /* SPSS Statistical Algorithms has completely different and WRONG advice here. */ - double sig1tailed = gslextras_cdf_binomial_P (n1, n1 + n2, p); + double sig1tailed = gsl_cdf_binomial_P (n1, p, n1 + n2); if ( p == 0.5 ) return sig1tailed > 0.5 ? 1.0 :sig1tailed * 2.0; diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk index 8130f5cf..2d149fce 100644 --- a/src/ui/gui/automake.mk +++ b/src/ui/gui/automake.mk @@ -59,7 +59,6 @@ src_ui_gui_psppire_LDADD = \ src/output/liboutput.a \ src/math/libpspp_math.a \ lib/linreg/liblinreg.a \ - lib/gsl-extras/libgsl-extras.a \ src/data/libdata.a \ src/libpspp/libpspp.a \ $(GTK_LIBS) \ diff --git a/src/ui/terminal/automake.mk b/src/ui/terminal/automake.mk index ae6d3a5e..34bed5ae 100644 --- a/src/ui/terminal/automake.mk +++ b/src/ui/terminal/automake.mk @@ -28,7 +28,6 @@ src_ui_terminal_pspp_LDADD = \ src/math/libpspp_math.a \ src/ui/libuicommon.a \ lib/linreg/liblinreg.a \ - lib/gsl-extras/libgsl-extras.a \ src/data/libdata.a \ src/libpspp/libpspp.a \ $(LIBXML2_LIBS) \ -- 2.30.2