expressions: Fix definitions of IDF.T1G and IDF.T2G.

[pspp] / src / language / expressions / operations.def

diff --git a/src/language/expressions/operations.def b/src/language/expressions/operations.def
index c0e684969b10d917cb2ff0796044f7c01cefbe84..42728e46ea0c98bff01f7e077718bdb9c8726272 100644 (file)
--- a/src/language/expressions/operations.def
+++ b/src/language/expressions/operations.def
@@ -602,9 +602,11 @@ function NUMBER (string s, ni_format f)
 
   if (s.length > f->w)
     s.length = f->w;
-  error = data_in (s, C_ENCODING, f->type, &out, 0, NULL);
+  error = data_in (s, C_ENCODING, f->type, settings_get_fmt_settings (),
+                   &out, 0, NULL);
   if (error == NULL)
-    data_in_imply_decimals (s, C_ENCODING, f->type, f->d, &out);
+    data_in_imply_decimals (s, C_ENCODING, f->type, f->d,
+                            settings_get_fmt_settings (), &out);
   else
     {
       msg (SE, "Cannot parse `%.*s' as format %s: %s",
@@ -624,7 +626,7 @@ absorb_miss string function STRING (x, no_format f)
   v.f = x;
 
   assert (!fmt_is_string (f->type));
-  s = data_out (&v, C_ENCODING, f);
+  s = data_out (&v, C_ENCODING, f, settings_get_fmt_settings ());
   dst = alloc_string (e, strlen (s));
   strcpy (dst.string, s);
   free (s);
@@ -870,14 +872,14 @@ function NPDF.T (x, df > 0, nc) = unimplemented;
 // Type-1 Gumbel distribution.
 extension function CDF.T1G (x, a, b) = gsl_cdf_gumbel1_P (x, a, b);
 extension function IDF.T1G (P >= 0 && P <= 1, a, b)
-     = gsl_cdf_gumbel1_P (P, a, b);
+     = gsl_cdf_gumbel1_Pinv (P, a, b);
 extension function PDF.T1G (x, a, b) = gsl_ran_gumbel1_pdf (x, a, b);
 no_opt extension function RV.T1G (a, b) = gsl_ran_gumbel1 (get_rng (), a, b);
 
 // Type-2 Gumbel distribution.
 extension function CDF.T2G (x, a, b) = gsl_cdf_gumbel2_P (x, a, b);
 extension function IDF.T2G (P >= 0 && P <= 1, a, b)
-     = gsl_cdf_gumbel2_P (P, a, b);
+     = gsl_cdf_gumbel2_Pinv (P, a, b);
 extension function PDF.T2G (x, a, b) = gsl_ran_gumbel2_pdf (x, a, b);
 no_opt extension function RV.T2G (a, b) = gsl_ran_gumbel2 (get_rng (), a, b);
 
@@ -960,8 +962,8 @@ function PDF.POISSON (k >= 0 && k == floor (k), mu > 0)
 no_opt function RV.POISSON (mu > 0) = gsl_ran_poisson (get_rng (), mu);
 
 // Weirdness.
-absorb_miss boolean function MISSING (x) = x == SYSMIS || !finite (x);
-absorb_miss boolean function SYSMIS (x) = x == SYSMIS || !finite (x);
+absorb_miss boolean function MISSING (x) = x == SYSMIS || !isfinite (x);
+absorb_miss boolean function SYSMIS (x) = x == SYSMIS || !isfinite (x);
 no_opt boolean function SYSMIS (num_var v)
      case c;
 {