Index: tamuanova-0.2/anova_1.c =================================================================== --- tamuanova-0.2.orig/anova_1.c 2006-02-01 22:38:53.000000000 +0100 +++ tamuanova-0.2/anova_1.c 2006-02-01 22:51:53.000000000 +0100 @@ -1,6 +1,3 @@ -#ifndef __TAMU_ANOVA_H -#define __TAMU_ANOVA_H - /* One way ANOVA This package defines ANOVA for one factor. @@ -13,31 +10,8 @@ #include #include #include //This is required for the tamu_anova_printtable function. +#include "tamu_anova.h" -/*This structure contains all the data that will be included in a one-way ANOVA table.*/ -struct tamu_anova_table { - long dfTr, - dfE, - dfT; //Degrees of freedom for the treatment, error, and total - double SSTr, - SSE, - SST; //Sum of squares for the treatment, error, and total - double MSTr, - MSE; //Mean squares for the treatment and error - double F; //F test statistic corresponding to the test - double p; //p value (upper tail probability) corresponding with the F statistic -}; - -/*This function runs one-way ANOVA after being passed the following arguments: - -data: An array of doubles representing all the observations to be included in the test. - -factor: An array of long integers representing the group that the corresponding data value - belongs in. For example, if factor[i]=1, then data[i] belongs in the first group or - first treatment level. - -I: The number of data values included in the test. - -J: The number of groups or levels of the treatment. Each member of the factor array - must be an integer value between 1 and J, inclusive. - -*/ struct tamu_anova_table tamu_anova(double data[],long factor[], long I, long J) { //Error checking////////////////////////////////////////////////////////////////////////////// @@ -139,4 +113,3 @@ printf("total %4li %10f\n",t.dfT,t.SST); }; -#endif /*__TAMU_ANOVA_H*/ Index: tamuanova-0.2/anova_2.c =================================================================== --- tamuanova-0.2.orig/anova_2.c 2005-12-29 18:51:35.000000000 +0100 +++ tamuanova-0.2/anova_2.c 2006-02-01 22:53:28.000000000 +0100 @@ -1,6 +1,3 @@ -#ifndef __GSL_TAMU_ANOVA_TWOWAY_H -#define __GSL_TAMU_ANOVA_TWOWAY_H - /* Two way ANOVA This package defines ANOVA for two factors, including: @@ -20,42 +17,8 @@ #include #include #include +#include "tamu_anova.h" -/*This structure contains all the data that will be included in a two-way ANOVA table.*/ -struct tamu_anova_table_twoway { - long dfA, - dfB, - dfAB, - dfE, - dfT; //Degrees of freedom for factor A, factor B, interaction, error, and total - double SSA, MSA, FA, pA, //For factor a, the sum of squares, mean squares, F statistic, and p value - SSB, MSB, FB, pB, //For factor b, the sum of squares, mean squares, F statistic, and p value - SSAB, MSAB, FAB, pAB, //For interaction, the sum of squares, mean squares, F statistic, and p value - SSE, MSE, //For error, the sum of squares and mean squares - SST; //The total sum of squares -}; - -//Definition of three different models -enum gsl_anova_twoway_types { - anova_fixed, - anova_random, - anova_mixed -}; - -/*This function runs two-way ANOVA after being passed the following arguments: - -data: An array of doubles representing all the observations to be included in the test. - -factor: A two-dimensional matrix of long integers representing the group that the - corresponding data value belongs in. For example, if factor[i][0]=1 and factor[i][1]=2, - then data[i] belongs in the group pertaining to the first treatment level of factor A - and the second treatment level of factor B. - -I: The number of data values included in the test. - -J: An array containing the number of treatment levels of factor A (J[0]) and factor B (J[1]). - For every i from 1 to I, factor[i][0] must be an integer value between 1 and J[0], and - factor[i][1] must be an integer value between 1 and J[1], both inclusive. - -type: Can take one of three values (anova_fixed, anova_random, or anova_mixed) and defines - the model of the study. -*/ - struct tamu_anova_table_twoway tamu_anova_twoway(double data[],long factor[][2], long I, long J[2], enum gsl_anova_twoway_types type) { @@ -366,4 +329,3 @@ printf("Total \t%ld\t%f\n",t.dfT,t.SST); } -#endif Index: tamuanova-0.2/tamu_anova.h =================================================================== --- tamuanova-0.2.orig/tamu_anova.h 2005-12-29 17:21:33.000000000 +0100 +++ tamuanova-0.2/tamu_anova.h 2006-02-01 22:53:33.000000000 +0100 @@ -13,40 +13,76 @@ __BEGIN_DECLS +/*This structure contains all the data that will be included in a one-way ANOVA table.*/ struct tamu_anova_table { long dfTr, dfE, - dfT; - double SSTr; - double SSE; - double SST; - double MSTr; - double MSE; - double F ; - double p;}; - + dfT; //Degrees of freedom for the treatment, error, and total + double SSTr, + SSE, + SST; //Sum of squares for the treatment, error, and total + double MSTr, + MSE; //Mean squares for the treatment and error + double F; //F test statistic corresponding to the test + double p; //p value (upper tail probability) corresponding with the F statistic +}; + +/*This function runs one-way ANOVA after being passed the following arguments: + -data: an array of doubles representing all the observations to be included in + the test. + -factor: an array of long integers representing the group that the + corresponding data value belongs in. For example, if factor[i]=1, then + data[i] belongs in the first group or first treatment level. + -I: the number of data values included in the test. + -J: the number of groups or levels of the treatment. Each member of the factor + array must be an integer value between 1 and J, inclusive. +*/ struct tamu_anova_table tamu_anova(double data[],long factor[], long I, long J); +/*This structure contains all the data that will be included in a two-way ANOVA table.*/ struct tamu_anova_table_twoway { - long - dfA, dfB, dfAB, dfE, dfT; - double - SSA, MSA, FA, pA, - SSB, MSB, FB, pB, - SSAB, MSAB, FAB, pAB, - SSE, MSE, - SST; + //Degrees of freedom for factor A, factor B, interaction, error, and total + long dfA, dfB, dfAB, dfE, dfT; + //For factor a, the sum of squares, mean squares, F statistic, and p value + double SSA, MSA, FA, pA, + //For factor b, the sum of squares, mean squares, F statistic, and p value + SSB, MSB, FB, pB, + //For interaction, the sum of squares, mean squares, F statistic, and p value + SSAB, MSAB, FAB, pAB, + //For error, the sum of squares and mean squares + SSE, MSE, + //The total sum of squares + SST; }; - +//Definition of three different models enum gsl_anova_twoway_types { anova_fixed, anova_random, anova_mixed }; -struct tamu_anova_table_twoway tamu_anova_twoway(double data[],long factor[][2], long I, long J[2], - enum gsl_anova_twoway_types type); +/*This function runs two-way ANOVA after being passed the following arguments: + -data: an array of doubles representing all the observations to be included in + the test. + -factor: a two-dimensional matrix of long integers representing the group that + the corresponding data value belongs in. For example, if factor[i][0]=1 + and factor[i][1]=2, then data[i] belongs in the group pertaining to the + first treatment level of factor A and the second treatment level of + factor B. + -I: the number of data values included in the test. + -J: an array containing the number of treatment levels of factor A (J[0]) and + factor B (J[1]). + For every i from 1 to I, factor[i][0] must be an integer value between + 1 and J[0], and factor[i][1] must be an integer value between 1 and + J[1], both inclusive. + -type: can take one of three values (anova_fixed, anova_random, or + anova_mixed) and defines the model of the study. +*/ + +struct tamu_anova_table_twoway tamu_anova_twoway(double data[], + long factor[][2], long I, long J[2], + enum gsl_anova_twoway_types type); void tamu_anova_printtable_twoway(struct tamu_anova_table_twoway t);