Rewrite PSPP output engine.

[pspp-builds.git] / tests / command / regression.sh

diff --git a/tests/command/regression.sh b/tests/command/regression.sh
index 9f8da00249a9682aa106bf521f0bf05203d8ddc2..88b4cd8318db1ba4daece8798460600137e0a2cc 100755 (executable)
--- a/tests/command/regression.sh
+++ b/tests/command/regression.sh
@@ -81,51 +81,42 @@ activity="run program"
 $SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from INLINE.
-+--------+------+
-|Variable|Format|
-#========#======#
-|v0      |F8.0  |
-|v1      |F8.0  |
-|v2      |F8.0  |
-+--------+------+
-2.1 REGRESSION.  Model Summary
-#============#========#=================#==========================#
-#          R #R Square|Adjusted R Square|Std. Error of the Estimate#
-#========#===#========#=================#==========================#
-#        |.97#     .94|              .93|                      1.34#
-#========#===#========#=================#==========================#
-2.2 REGRESSION.  ANOVA
-#===================#==============#==#===========#=====#============#
-#                   #Sum of Squares|df|Mean Square|  F  |Significance#
-#========#==========#==============#==#===========#=====#============#
-#        |Regression#        202.75| 2|     101.38|56.75|         .00#
-#        |Residual  #         12.50| 7|       1.79|     |            #
-#        |Total     #        215.26| 9|           |     |            #
-#========#==========#==============#==#===========#=====#============#
-2.3 REGRESSION.  Coefficients
-#===================#=====#==========#=====#======#============#
-#                   #  B  |Std. Error| Beta|   t  |Significance#
-#========#==========#=====#==========#=====#======#============#
-#        |(Constant)# 2.19|      2.36|  .00|   .93|         .52#
-#        |    v0    # 1.81|      1.05|  .17|  1.72|         .12#
-#        |    v1    #-3.43|       .33|-1.03|-10.33|         .00#
-#        |          #     |          |     |      |            #
-#========#==========#=====#==========#=====#======#============#
-      v0       v1       v2     RES1    PRED1
--------- -------- -------- -------- --------
-     .65     7.74   -23.98     -.84   -23.13 
-    -.13     6.14   -19.64     -.54   -19.10 
-     .35     7.65   -25.27    -1.87   -23.40 
-     .69     6.13   -16.57      .97   -17.54 
-    -.07     8.25   -25.80      .40   -26.20 
-    -.34     6.03   -17.57     1.53   -19.10 
-     .76     9.83   -28.36     1.77   -30.13 
-    -.47     5.34   -16.80      .18   -16.97 
-    -.06     8.84   -29.26    -1.05   -28.21 
-     .56     6.20   -18.58     -.54   -18.04 
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+v0,F8.0
+v1,F8.0
+v2,F8.0
+
+Table: Model Summary
+,R,R Square,Adjusted R Square,Std. Error of the Estimate
+,.97,.94,.93,1.34
+
+Table: ANOVA
+,,Sum of Squares,df,Mean Square,F,Significance
+,Regression,202.75,2,101.38,56.75,.00
+,Residual,12.50,7,1.79,,
+,Total,215.26,9,,,
+
+Table: Coefficients
+,,B,Std. Error,Beta,t,Significance
+,(Constant),2.19,2.36,.00,.93,.52
+,v0,1.81,1.05,.17,1.72,.12
+,v1,-3.43,.33,-1.03,-10.33,.00
+,,,,,,
+
+Table: Data List
+v0,v1,v2,RES1,PRED1
+.65,7.74,-23.98,-.84,-23.13
+-.13,6.14,-19.64,-.54,-19.10
+.35,7.65,-25.27,-1.87,-23.40
+.69,6.13,-16.57,.97,-17.54
+-.07,8.25,-25.80,.40,-26.20
+-.34,6.03,-17.57,1.53,-19.10
+.76,9.83,-28.36,1.77,-30.13
+-.47,5.34,-16.80,.18,-16.97
+-.06,8.84,-29.26,-1.05,-28.21
+.56,6.20,-18.58,-.54,-18.04
 EOF
 if [ $? -ne 0 ] ; then fail ; fi