projects
/
pspp-builds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fddc7de
)
Fixed Bug #19424 (confidence interval from EXAMINE).
author
John Darrington
<john@darrington.wattle.id.au>
Thu, 12 Apr 2007 09:48:34 +0000
(09:48 +0000)
committer
John Darrington
<john@darrington.wattle.id.au>
Thu, 12 Apr 2007 09:48:34 +0000
(09:48 +0000)
Makefile.am
patch
|
blob
|
history
Smake
patch
|
blob
|
history
src/language/stats/examine.q
patch
|
blob
|
history
tests/command/examine.sh
patch
|
blob
|
history
tests/command/trimmed-mean.sh
patch
|
blob
|
history
diff --git
a/Makefile.am
b/Makefile.am
index 9a242a31e3168fe058b600c1336b8bc28132ee9a..806fc2a9768ae596613e1afebcdf2ec951e0bebb 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-3,7
+3,7
@@
AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
SUBDIRS = gl po
AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
SUBDIRS = gl po
-DISTCLEANFILES = ./po/stamp-po
+DISTCLEANFILES = ./po/stamp-po
xconfigure
BUILT_SOURCES =
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
BUILT_SOURCES =
AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl
diff --git
a/Smake
b/Smake
index 8c068c0163ddb417155e3e606cd6560f41d43767..c716bae0d48764ed12e0ea92fc132252aaacf902 100644
(file)
--- a/
Smake
+++ b/
Smake
@@
-132,5
+132,6
@@
clean:
find . -name Makefile.in -exec rm -f {} \;
rm -f compile
rm -f ltmain.sh
find . -name Makefile.in -exec rm -f {} \;
rm -f compile
rm -f ltmain.sh
+ rm -f reloc-ldflags install-reloc
.PHONY: all gettextize potfiles clean
.PHONY: all gettextize potfiles clean
diff --git
a/src/language/stats/examine.q
b/src/language/stats/examine.q
index b040e19bc7fd84f41af7fb9a78033f50bdc81941..bb6f9eec5da0f5f9ba24d06e57d9d1cbe4ae7556 100644
(file)
--- a/
src/language/stats/examine.q
+++ b/
src/language/stats/examine.q
@@
-1507,18
+1507,14
@@
show_descriptives (const struct variable **dependent_var,
}
}
-
-
/* Fill in the descriptives data */
void
populate_descriptives (struct tab_table *tbl, int col, int row,
const struct metrics *m)
{
/* Fill in the descriptives data */
void
populate_descriptives (struct tab_table *tbl, int col, int row,
const struct metrics *m)
{
-
- const double t = gsl_cdf_tdist_Qinv (1 - cmd.n_cinterval[0]/100.0/2.0, \
+ const double t = gsl_cdf_tdist_Qinv ((1 - cmd.n_cinterval[0] / 100.0)/2.0,
m->n -1);
m->n -1);
-
tab_text (tbl, col,
row,
TAB_LEFT | TAT_TITLE,
tab_text (tbl, col,
row,
TAB_LEFT | TAT_TITLE,
diff --git
a/tests/command/examine.sh
b/tests/command/examine.sh
index 3ca027191983fe4cf2edc3289e4621a0d96e58b7..7c1f394221efdc48ff0612478a819003cfcfc16a 100755
(executable)
--- a/
tests/command/examine.sh
+++ b/
tests/command/examine.sh
@@
-155,8
+155,8
@@
Case# QUALITY W BRAND
# #Statistic|Std. Error#
#============================================================#=========#==========#
#Breaking Strain Mean # 3.54 | .324 #
# #Statistic|Std. Error#
#============================================================#=========#==========#
#Breaking Strain Mean # 3.54 | .324 #
-# 95% Confidence Interval for Mean Lower Bound#
3.562
| #
-# Upper Bound#
3.521
| #
+# 95% Confidence Interval for Mean Lower Bound#
2.871
| #
+# Upper Bound#
4.212
| #
# 5% Trimmed Mean # 3.50 | #
# Median # 4.00 | #
# Variance # 2.520 | #
# 5% Trimmed Mean # 3.50 | #
# Median # 4.00 | #
# Variance # 2.520 | #
@@
-213,8
+213,8
@@
Case# QUALITY W BRAND
# Manufacturer #Statistic|Std. Error#
#=========================================================================#=========#==========#
#Breaking Strain Aspeger Mean # 2.25 | .453 #
# Manufacturer #Statistic|Std. Error#
#=========================================================================#=========#==========#
#Breaking Strain Aspeger Mean # 2.25 | .453 #
-# 95% Confidence Interval for Mean Lower Bound#
2.279
| #
-# Upper Bound#
2.221
| #
+# 95% Confidence Interval for Mean Lower Bound#
1.178
| #
+# Upper Bound#
3.322
| #
# 5% Trimmed Mean # 2.22 | #
# Median # 2.00 | #
# Variance # 1.643 | #
# 5% Trimmed Mean # 2.22 | #
# Median # 2.00 | #
# Variance # 1.643 | #
@@
-227,8
+227,8
@@
Case# QUALITY W BRAND
# Kurtosis # -1.546 | 1.481 #
# ----------------------------------------------------------#---------+----------#
# Bloggs Mean # 3.50 | .378 #
# Kurtosis # -1.546 | 1.481 #
# ----------------------------------------------------------#---------+----------#
# Bloggs Mean # 3.50 | .378 #
-# 95% Confidence Interval for Mean Lower Bound#
3.525
| #
-# Upper Bound#
3.475
| #
+# 95% Confidence Interval for Mean Lower Bound#
2.606
| #
+# Upper Bound#
4.394
| #
# 5% Trimmed Mean # 3.50 | #
# Median # 4.00 | #
# Variance # 1.143 | #
# 5% Trimmed Mean # 3.50 | #
# Median # 4.00 | #
# Variance # 1.143 | #
@@
-241,8
+241,8
@@
Case# QUALITY W BRAND
# Kurtosis # -.831 | 1.481 #
# ----------------------------------------------------------#---------+----------#
# Charlies Mean # 4.88 | .441 #
# Kurtosis # -.831 | 1.481 #
# ----------------------------------------------------------#---------+----------#
# Charlies Mean # 4.88 | .441 #
-# 95% Confidence Interval for Mean Lower Bound#
4.904
| #
-# Upper Bound#
4.846
| #
+# 95% Confidence Interval for Mean Lower Bound#
3.833
| #
+# Upper Bound#
5.917
| #
# 5% Trimmed Mean # 4.86 | #
# Median # 5.00 | #
# Variance # 1.554 | #
# 5% Trimmed Mean # 4.86 | #
# Median # 5.00 | #
# Variance # 1.554 | #
diff --git
a/tests/command/trimmed-mean.sh
b/tests/command/trimmed-mean.sh
index 8e51c0b2b8cf043ad141877b276cc910929826c5..ea30f8f56cb0f2258f5b2887546a9772eb4352ad 100755
(executable)
--- a/
tests/command/trimmed-mean.sh
+++ b/
tests/command/trimmed-mean.sh
@@
-106,8
+106,8
@@
diff -b $TEMPDIR/pspp.list - << EOF
# #Statistic|Std. Error#
#==============================================#=========#==========#
#X Mean # 2.02 | .034 #
# #Statistic|Std. Error#
#==============================================#=========#==========#
#X Mean # 2.02 | .034 #
-# 95% Confidence Interval for Mean Lower Bound#
2.021
| #
-# Upper Bound# 2.0
1
7 | #
+# 95% Confidence Interval for Mean Lower Bound#
1.952
| #
+# Upper Bound# 2.0
8
7 | #
# 5% Trimmed Mean # 2.00 | #
# Median # 2.00 | #
# Variance # .058 | #
# 5% Trimmed Mean # 2.00 | #
# Median # 2.00 | #
# Variance # .058 | #