New function.

2001-07-12  Morten Welinder  <terra@diku.dk>

	* src/mathfunc.c (range_multinomial): New function.

	* configure.in (evolution): Fix check, but see BUGS.

2001-07-12  Morten Welinder  <terra@diku.dk>

	* fn-math.c (gnumeric_multinomial): Cleanup.

BUGS

@@ -25,6 +25,11 @@ Release Critical
 
     - 57372
 
+    - The evolution check is broken.  We should check for "idl/Evolution-Composer.h"
+      because we use it in workbook-control-gui.c.  Moreover, the idl check currently
+      in configure.in should be run-time, not compile time.
+
+
 Pending Patches
 ---------------
 

ChangeLog

+2001-07-12  Morten Welinder  <terra@diku.dk>
+
+	* src/mathfunc.c (range_multinomial): New function.
+
+	* configure.in (evolution): Fix check, but see BUGS.
+
 2001-07-12  Almer S. Tigelaar  <almer@gnome.org>
 
 	* src/gnumeric-pane.c (gnumeric_pane_set_bounds): Kill warning.

NEWS

@@ -18,6 +18,7 @@ Jody:
 Morten:
 	* Improve bsd support.
 	* Fix CONCATENATE.
+	* Fix MULTINOMIAL.
 
 Rodrigo:
 	* Update gda support.

OChangeLog-2002-01-22

+2001-07-12  Morten Welinder  <terra@diku.dk>
+
+	* src/mathfunc.c (range_multinomial): New function.
+
+	* configure.in (evolution): Fix check, but see BUGS.
+
 2001-07-12  Almer S. Tigelaar  <almer@gnome.org>
 
 	* src/gnumeric-pane.c (gnumeric_pane_set_bounds): Kill warning.

OChangeLog-2003-12-23

+2001-07-12  Morten Welinder  <terra@diku.dk>
+
+	* src/mathfunc.c (range_multinomial): New function.
+
+	* configure.in (evolution): Fix check, but see BUGS.
+
 2001-07-12  Almer S. Tigelaar  <almer@gnome.org>
 
 	* src/gnumeric-pane.c (gnumeric_pane_set_bounds): Kill warning.

OChangeLog-2005-11-14

+2001-07-12  Morten Welinder  <terra@diku.dk>
+
+	* src/mathfunc.c (range_multinomial): New function.
+
+	* configure.in (evolution): Fix check, but see BUGS.
+
 2001-07-12  Almer S. Tigelaar  <almer@gnome.org>
 
 	* src/gnumeric-pane.c (gnumeric_pane_set_bounds): Kill warning.

configure.in

@@ -523,9 +523,6 @@ AC_ARG_WITH(evolution,
 if $try_evolution; then
 	path_to_composer_idl=`gnome-config --datadir`/idl/Evolution-Composer.idl
 	AC_CHECK_FILE($path_to_composer_idl, evolution=yes, evolution=no)
-	if test x$evolution=xyes; then
-		AC_DEFINE(ENABLE_EVOLUTION)
-	fi
 fi
 AM_CONDITIONAL(ENABLE_EVOLUTION, test x"$evolution" = "xyes")
 

plugins/fn-math/functions.c

@@ -1551,47 +1551,16 @@ static char *help_multinomial = {
 	   "@SEEALSO=SUM")
 };
 
-typedef struct {
-	guint32 num;
-	int     sum;
-        int     product;
-} math_multinomial_t;
-
-static Value *
-callback_function_multinomial (const EvalPos *ep, Value *value,
-			       void *closure)
-{
-	math_multinomial_t *mm = closure;
-
-	switch (value->type){
-	case VALUE_INTEGER:
-	        mm->product *= fact(value->v_int.val);
-		mm->sum += value->v_int.val;
-		mm->num++;
-		break;
-	case VALUE_EMPTY:
-	default:
-		return value_terminate();
-	}
-	return NULL;
-}
 
 static Value *
 gnumeric_multinomial (FunctionEvalInfo *ei, GList *nodes)
 {
-        math_multinomial_t p;
-
-	p.num = 0;
-	p.sum = 0;
-	p.product = 1;
-
-	if (function_iterate_argument_values (ei->pos,
-					      callback_function_multinomial,
-					      &p, nodes,
-					      TRUE, TRUE) != NULL)
-	        return value_new_error (ei->pos, gnumeric_err_VALUE);
-
-	return value_new_float (fact(p.sum) / p.product);
+	return float_range_function (nodes, ei,
+				     range_multinomial,
+				     COLLECT_IGNORE_STRINGS |
+				     COLLECT_IGNORE_BOOLS |
+				     COLLECT_IGNORE_BLANKS,
+				     gnumeric_err_NUM);
 }
 
 /***************************************************************************/
@@ -1641,7 +1610,7 @@ static char *help_g_product = {
 	   "@DESCRIPTION="
 	   "PRODUCT returns the product of all the values and cells "
 	   "referenced in the argument list.  Empty cells are ignored "
-	   "and the empty product in 1."
+	   "and the empty product is 1."
 	   "\n"
 	   "@EXAMPLES=\n"
 	   "G_PRODUCT(2,5,9) equals 90.\n"

src/functions/ChangeLog

+2001-07-12  Morten Welinder  <terra@diku.dk>
+
+	* fn-math.c (gnumeric_multinomial): Cleanup.
+
 2001-07-07  Morten Welinder  <terra@diku.dk>
 
 	* fn-information.c (gnumeric_expression, help_expression): Moved

src/functions/fn-math.c

@@ -1551,47 +1551,16 @@ static char *help_multinomial = {
 	   "@SEEALSO=SUM")
 };
 
-typedef struct {
-	guint32 num;
-	int     sum;
-        int     product;
-} math_multinomial_t;
-
-static Value *
-callback_function_multinomial (const EvalPos *ep, Value *value,
-			       void *closure)
-{
-	math_multinomial_t *mm = closure;
-
-	switch (value->type){
-	case VALUE_INTEGER:
-	        mm->product *= fact(value->v_int.val);
-		mm->sum += value->v_int.val;
-		mm->num++;
-		break;
-	case VALUE_EMPTY:
-	default:
-		return value_terminate();
-	}
-	return NULL;
-}
 
 static Value *
 gnumeric_multinomial (FunctionEvalInfo *ei, GList *nodes)
 {
-        math_multinomial_t p;
-
-	p.num = 0;
-	p.sum = 0;
-	p.product = 1;
-
-	if (function_iterate_argument_values (ei->pos,
-					      callback_function_multinomial,
-					      &p, nodes,
-					      TRUE, TRUE) != NULL)
-	        return value_new_error (ei->pos, gnumeric_err_VALUE);
-
-	return value_new_float (fact(p.sum) / p.product);
+	return float_range_function (nodes, ei,
+				     range_multinomial,
+				     COLLECT_IGNORE_STRINGS |
+				     COLLECT_IGNORE_BOOLS |
+				     COLLECT_IGNORE_BLANKS,
+				     gnumeric_err_NUM);
 }
 
 /***************************************************************************/
@@ -1641,7 +1610,7 @@ static char *help_g_product = {
 	   "@DESCRIPTION="
 	   "PRODUCT returns the product of all the values and cells "
 	   "referenced in the argument list.  Empty cells are ignored "
-	   "and the empty product in 1."
+	   "and the empty product is 1."
 	   "\n"
 	   "@EXAMPLES=\n"
 	   "G_PRODUCT(2,5,9) equals 90.\n"

src/mathfunc.c

@@ -393,22 +393,6 @@ range_harmonic_mean (const gnum_float *xs, int n, gnum_float *res)
 		return 1;
 }
 
-/* Product.  */
-int
-range_product (const gnum_float *xs, int n, gnum_float *res)
-{
-	gnum_float product = 1;
-	int i;
-
-	/* FIXME: we should work harder at avoiding
-	   overflow here.  */
-	for (i = 0; i < n; i++) {
-		product *= xs[i];
-	}
-	*res = product;
-	return 0;
-}
-
 /* Geometric mean of positive numbers.  */
 int
 range_geometric_mean (const gnum_float *xs, int n, gnum_float *res)
@@ -431,6 +415,57 @@ range_geometric_mean (const gnum_float *xs, int n, gnum_float *res)
 }
 
 
+/* Product.  */
+int
+range_product (const gnum_float *xs, int n, gnum_float *res)
+{
+	gnum_float product = 1;
+	int i;
+
+	/* FIXME: we should work harder at avoiding overflow here.  */
+	for (i = 0; i < n; i++) {
+		product *= xs[i];
+	}
+	*res = product;
+	return 0;
+}
+
+int
+range_multinomial (const gnum_float *xs, int n, gnum_float *res)
+{
+	gnum_float result = 1;
+	int sum = 0;
+	int i;
+
+	for (i = 0; i < n; i++) {
+		gnum_float x = xs[i];
+		int xi;
+
+		if (x < 0)
+			return 1;
+
+		xi = (int)x;
+		if (sum == 0 || xi == 0)
+			; /* Nothing.  */
+		else if (xi < 20) {
+			int j;
+			int f = sum + xi;
+
+			result *= f--;
+			for (j = 2; j <= xi; j++)
+				result = result * f-- / j;
+		} else {
+			/* Same as above, only faster.  */
+			result *= combin (sum + xi, xi);
+		}
+
+		sum += xi;
+	}
+
+	*res = result;
+	return 0;
+}
+
 int
 range_covar (const gnum_float *xs, const gnum_float *ys, int n, gnum_float *res)
 {

src/mathfunc.h

@@ -40,6 +40,7 @@ double gnumeric_fake_trunc (double x);
 
 int range_sum (const gnum_float *xs, int n, gnum_float *res);
 int range_product (const gnum_float *xs, int n, gnum_float *res);
+int range_multinomial (const gnum_float *xs, int n, gnum_float *res);
 
 int range_sumsq (const gnum_float *xs, int n, gnum_float *res);
 int range_avedev (const gnum_float *xs, int n, gnum_float *res);