Update of /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests
In directory 
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18121/tests/suite_00/Tests

Modified Files:
      Tag: GDK-2
        test_00.stable.out test_01.stable.out test_02.stable.out 
        test_05.stable.out test_40.stable.out test_70.stable.out 
Log Message:
approved output after view changes


Index: test_00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_00.stable.out,v
retrieving revision 1.33.2.1
retrieving revision 1.33.2.2
diff -u -d -r1.33.2.1 -r1.33.2.2
--- test_00.stable.out  10 Aug 2007 16:36:49 -0000      1.33.2.1
+++ test_00.stable.out  19 Aug 2007 12:36:11 -0000      1.33.2.2
@@ -241,52 +241,52 @@
     mb_a := bat.insert(b,4,16);        # 75 BKCinsert_bun 
(mb_a:void)<-(b:bat[:int,:int])(_79:int)(_91:int)
 #      io.print("b.insert(int(nil),81);");     # 76  (_67:str)
     nb_a := calc.int(nil:void);        # 77 CALCnil2int (nb_a:int)<-(_83:void)
-    ob_a := bat.insert(b,nb_a,81);     # 78 BKCinsert_bun 
(ob_a:void)<-(b:bat[:int,:int])(nb_a:int)(_70:int)
-#      io.print("b.insert(1,15);");    # 79  (_103:str)
+    ob_a := bat.insert(b,nb_a,81);     # 78 BKCinsert_bun 
(ob_a:void)<-(b:bat[:int,:int])(nb_a:int)(_104:int)
+#      io.print("b.insert(1,15);");    # 79  (_105:str)
     pb_a := bat.insert(b,1,15);        # 80 BKCinsert_bun 
(pb_a:void)<-(b:bat[:int,:int])(_75:int)(_94:int)
 #      io.print("b.count().print();");         # 81  (_105:str)
     qb_a := aggr.count(b);     # 82 ALGcount_bat (qb_a:int)<-(b:bat[:int,:int])
     rb_a := io.print(qb_a);    # 83 IOprint_val (rb_a:void)<-(qb_a:int)
 #      io.print("b.print();");         # 84  (_108:str)
     sb_a := io.print(b);       # 85 IOprint_val (sb_a:void)<-(b:bat[:int,:int])
-#      io.print("# Lets cut out a few sections\n");    # 86  (_110:str)
-    tb_a := algebra.select(b,25,64);   # 87 ALGselect 
(tb_a:bat[:int,:int])<-(b:bat[:int,:int])(_112:int)(_113:int)
+#      io.print("# Lets cut out a few sections\n");    # 86  (_112:str)
+    tb_a := algebra.select(b,25,64);   # 87 ALGselect 
(tb_a:bat[:int,:int])<-(b:bat[:int,:int])(_114:int)(_115:int)
     ub_a := io.print(tb_a);    # 88 IOprint_val 
(ub_a:void)<-(tb_a:bat[:int,:int])
-#      io.print("b.select(4,15).print();");    # 89  (_115:str)
-    vb_a := algebra.select(b,4,15);    # 90 ALGselect 
(vb_a:bat[:int,:int])<-(b:bat[:int,:int])(_117:int)(_94:int)
+#      io.print("b.select(4,15).print();");    # 89  (_117:str)
+    vb_a := algebra.select(b,4,15);    # 90 ALGselect 
(vb_a:bat[:int,:int])<-(b:bat[:int,:int])(_119:int)(_94:int)
     wb_a := io.print(vb_a);    # 91 IOprint_val 
(wb_a:void)<-(vb_a:bat[:int,:int])
-#      io.print("b.select(4,4).print();");     # 92  (_119:str)
-    xb_a := algebra.select(b,4,4);     # 93 ALGselect 
(xb_a:bat[:int,:int])<-(b:bat[:int,:int])(_117:int)(_117:int)
+#      io.print("b.select(4,4).print();");     # 92  (_121:str)
+    xb_a := algebra.select(b,4,4);     # 93 ALGselect 
(xb_a:bat[:int,:int])<-(b:bat[:int,:int])(_119:int)(_119:int)
     yb_a := io.print(xb_a);    # 94 IOprint_val 
(yb_a:void)<-(xb_a:bat[:int,:int])
-#      io.print("# This should cause an error\n");     # 95  (_86:str)
-    ac_a := algebra.select(b,4,3);     # 96 ALGselect 
(ac_a:bat[:int,:int])<-(b:bat[:int,:int])(_117:int)(_123:int)
+#      io.print("# This should cause an error\n");     # 95  (_124:str)
+    ac_a := algebra.select(b,4,3);     # 96 ALGselect 
(ac_a:bat[:int,:int])<-(b:bat[:int,:int])(_119:int)(_126:int)
     bc_a := io.print(ac_a);    # 97 IOprint_val 
(bc_a:void)<-(ac_a:bat[:int,:int])
-#      io.print("b.select(81,int(nil)).print();");     # 98  (_125:str)
-    cc_a := calc.int(nil:void);        # 99 CALCnil2int (cc_a:int)<-(_127:void)
-    dc_a := algebra.select(b,81,cc_a); # 100 ALGselect 
(dc_a:bat[:int,:int])<-(b:bat[:int,:int])(_129:int)(cc_a:int)
+#      io.print("b.select(81,int(nil)).print();");     # 98  (_128:str)
+    cc_a := calc.int(nil:void);        # 99 CALCnil2int (cc_a:int)<-(_130:void)
+    dc_a := algebra.select(b,81,cc_a); # 100 ALGselect 
(dc_a:bat[:int,:int])<-(b:bat[:int,:int])(_104:int)(cc_a:int)
     ec_a := io.print(dc_a);    # 101 IOprint_val 
(ec_a:void)<-(dc_a:bat[:int,:int])
-#      io.print("b.select(int(nil),int(nil)).print();");       # 102  
(_131:str)
-    fc_a := calc.int(nil:void);        # 103 CALCnil2int 
(fc_a:int)<-(_127:void)
-    gc_a := calc.int(nil:void);        # 104 CALCnil2int 
(gc_a:int)<-(_127:void)
+#      io.print("b.select(int(nil),int(nil)).print();");       # 102  
(_133:str)
+    fc_a := calc.int(nil:void);        # 103 CALCnil2int 
(fc_a:int)<-(_130:void)
+    gc_a := calc.int(nil:void);        # 104 CALCnil2int 
(gc_a:int)<-(_130:void)
     hc_a := algebra.select(b,fc_a,gc_a);       # 105 ALGselect 
(hc_a:bat[:int,:int])<-(b:bat[:int,:int])(fc_a:int)(gc_a:int)
     ic_a := io.print(hc_a);    # 106 IOprint_val 
(ic_a:void)<-(hc_a:bat[:int,:int])
-#      io.print("# A 2-dimensional cut\n");    # 107  (_136:str)
-    bn := algebra.fragment(b,1,5,4,15);        # 108 ALGfragment 
(bn:bat[:int,:int])<-(b:bat[:int,:int])(_138:int)(_139:int)(_117:int)(_140:int)
+#      io.print("# A 2-dimensional cut\n");    # 107  (_138:str)
+    bn := algebra.fragment(b,1,5,4,15);        # 108 ALGfragment 
(bn:bat[:int,:int])<-(b:bat[:int,:int])(_140:int)(_141:int)(_119:int)(_142:int)
     jc_a := io.print(bn);      # 109 IOprint_val 
(jc_a:void)<-(bn:bat[:int,:int])
-#      io.print("b.fragment(1,5,16,int(nil)).print();");       # 110  
(_142:str)
-    kc_a := calc.int(nil:void);        # 111 CALCnil2int 
(kc_a:int)<-(_127:void)
-    lc_a := algebra.fragment(b,1,5,16,kc_a);   # 112 ALGfragment 
(lc_a:bat[:int,:int])<-(b:bat[:int,:int])(_138:int)(_139:int)(_145:int)(kc_a:int)
+#      io.print("b.fragment(1,5,16,int(nil)).print();");       # 110  
(_144:str)
+    kc_a := calc.int(nil:void);        # 111 CALCnil2int 
(kc_a:int)<-(_130:void)
+    lc_a := algebra.fragment(b,1,5,16,kc_a);   # 112 ALGfragment 
(lc_a:bat[:int,:int])<-(b:bat[:int,:int])(_140:int)(_141:int)(_147:int)(kc_a:int)
     mc_a := io.print(lc_a);    # 113 IOprint_val 
(mc_a:void)<-(lc_a:bat[:int,:int])
-#      io.print("b.fragment(1,int(nil),16,int(nil)).print();");        # 114  
(_147:str)
-    nc_a := calc.int(nil:void);        # 115 CALCnil2int 
(nc_a:int)<-(_127:void)
-    oc_a := calc.int(nil:void);        # 116 CALCnil2int 
(oc_a:int)<-(_127:void)
-    pc_a := algebra.fragment(b,1,nc_a,16,oc_a);        # 117 ALGfragment 
(pc_a:bat[:int,:int])<-(b:bat[:int,:int])(_138:int)(nc_a:int)(_145:int)(oc_a:int)
+#      io.print("b.fragment(1,int(nil),16,int(nil)).print();");        # 114  
(_149:str)
+    nc_a := calc.int(nil:void);        # 115 CALCnil2int 
(nc_a:int)<-(_130:void)
+    oc_a := calc.int(nil:void);        # 116 CALCnil2int 
(oc_a:int)<-(_130:void)
+    pc_a := algebra.fragment(b,1,nc_a,16,oc_a);        # 117 ALGfragment 
(pc_a:bat[:int,:int])<-(b:bat[:int,:int])(_140:int)(nc_a:int)(_147:int)(oc_a:int)
     qc_a := io.print(pc_a);    # 118 IOprint_val 
(qc_a:void)<-(pc_a:bat[:int,:int])
-#      io.print("b.fragment(int(nil),int(nil),16,int(nil)).print();");         
# 119  (_152:str)
-    rc_a := calc.int(nil:void);        # 120 CALCnil2int 
(rc_a:int)<-(_127:void)
-    sc_a := calc.int(nil:void);        # 121 CALCnil2int 
(sc_a:int)<-(_127:void)
-    tc_a := calc.int(nil:void);        # 122 CALCnil2int 
(tc_a:int)<-(_127:void)
-    uc_a := algebra.fragment(b,rc_a,sc_a,16,tc_a);     # 123 ALGfragment 
(uc_a:bat[:int,:int])<-(b:bat[:int,:int])(rc_a:int)(sc_a:int)(_145:int)(tc_a:int)
+#      io.print("b.fragment(int(nil),int(nil),16,int(nil)).print();");         
# 119  (_154:str)
+    rc_a := calc.int(nil:void);        # 120 CALCnil2int 
(rc_a:int)<-(_130:void)
+    sc_a := calc.int(nil:void);        # 121 CALCnil2int 
(sc_a:int)<-(_130:void)
+    tc_a := calc.int(nil:void);        # 122 CALCnil2int 
(tc_a:int)<-(_130:void)
+    uc_a := algebra.fragment(b,rc_a,sc_a,16,tc_a);     # 123 ALGfragment 
(uc_a:bat[:int,:int])<-(b:bat[:int,:int])(rc_a:int)(sc_a:int)(_147:int)(tc_a:int)
     vc_a := io.print(uc_a);    # 124 IOprint_val 
(vc_a:void)<-(uc_a:bat[:int,:int])
 #      io.print("bn:= b.join(bn.reverse());");         # 125  (_158:str)
     wc_a := bat.reverse(bn);   # 126 BKCreverse 
(wc_a:bat[:int,:int])<-(bn:bat[:int,:int])
@@ -300,12 +300,12 @@
     ad_a := io.print(bn);      # 134 IOprint_val 
(ad_a:void)<-(bn:bat[:int,:int])
 #      io.print("# band algebra.join experiment\n");   # 135  (_165:str)
     c := algebra.copy(b);      # 136 ALGcopy 
(c:bat[:int,:int])<-(b:bat[:int,:int])
-#      io.print("bandjoin(b,c,4,4).print();");         # 137  (_167:str)
-    bd_a := algebra.bandjoin(b,c,4,4); # 138 ALGbandjoin 
(bd_a:bat[:int,:int])<-(b:bat[:int,:int])(c:bat[:int,:int])(_169:int)(_169:int)
+#      io.print("bandjoin(b,c,4,4).print();");         # 137  (_169:str)
+    bd_a := algebra.bandjoin(b,c,4,4); # 138 ALGbandjoin 
(bd_a:bat[:int,:int])<-(b:bat[:int,:int])(c:bat[:int,:int])(_171:int)(_171:int)
     cd_a := io.print(bd_a);    # 139 IOprint_val 
(cd_a:void)<-(bd_a:bat[:int,:int])
-#      io.print("#and theta algebra.joins\?\n");       # 140  (_171:str)
-    LT := -1;  # 141  (LT:int)<-(_173:int)
-    dd_a := calc.lng(nil:void);        # 142 CALCnil2lng 
(dd_a:lng)<-(_175:void)
+#      io.print("#and theta algebra.joins\?\n");       # 140  (_173:str)
+    LT := -1;  # 141  (LT:int)<-(_175:int)
+    dd_a := calc.lng(nil:void);        # 142 CALCnil2lng 
(dd_a:lng)<-(_177:void)
     ed_a := algebra.thetajoin(b,c,LT,dd_a);    # 143 ALGthetajoinEstimate 
(ed_a:bat[:int,:int])<-(b:bat[:int,:int])(c:bat[:int,:int])(LT:int)(dd_a:lng)
     fd_a := io.print(ed_a);    # 144 IOprint_val 
(fd_a:void)<-(ed_a:bat[:int,:int])
 #      io.print("quit();");    # 145  (_178:str)

Index: test_02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_02.stable.out,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -d -r1.28.2.1 -r1.28.2.2
--- test_02.stable.out  10 Aug 2007 16:36:49 -0000      1.28.2.1
+++ test_02.stable.out  19 Aug 2007 12:36:12 -0000      1.28.2.2
@@ -119,12 +119,12 @@
     qa_a := algebra.find(s,"cello");   # 40 ALGfind 
(qa_a:int)<-(s:bat[:str,:int])(_31:str)
     ra_a := io.print(qa_a);    # 41 IOprint_val (ra_a:void)<-(qa_a:int)
 #      io.print("delete(s,\"cello\",3);");     # 42  (_62:str)
-    sa_a := bat.delete(s,"cello",3);   # 43 BKCdelete_bun 
(sa_a:void)<-(s:bat[:str,:int])(_31:str)(_32:int)
-#      io.print("print(s);");  # 44  (_64:str)
+    sa_a := bat.delete(s,"cello",3);   # 43 BKCdelete_bun 
(sa_a:void)<-(s:bat[:str,:int])(_64:str)(_65:int)
+#      io.print("print(s);");  # 44  (_66:str)
     ta_a := io.print(s);       # 45 IOprint_val (ta_a:void)<-(s:bat[:str,:int])
-#      io.print("var sn:= algebra.select(s,1,5);");    # 46  (_66:str)
-    sn := algebra.select(s,1,5);       # 47 ALGselect 
(sn:bat[:str,:int])<-(s:bat[:str,:int])(_68:int)(_40:int)
-#      io.print("print(sn);");         # 48  (_69:str)
+#      io.print("var sn:= algebra.select(s,1,5);");    # 46  (_68:str)
+    sn := algebra.select(s,1,5);       # 47 ALGselect 
(sn:bat[:str,:int])<-(s:bat[:str,:int])(_70:int)(_40:int)
+#      io.print("print(sn);");         # 48  (_71:str)
     ua_a := io.print(sn);      # 49 IOprint_val 
(ua_a:void)<-(sn:bat[:str,:int])
 #      io.print("var s2:= semijoin(s.reverse(),sn.reverse());");       # 50  
(_71:str)
     va_a := bat.reverse(s);    # 51 BKCreverse 
(va_a:bat[:int,:str])<-(s:bat[:str,:int])

Index: test_01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_01.stable.out,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- test_01.stable.out  12 Jun 2007 17:22:22 -0000      1.26
+++ test_01.stable.out  19 Aug 2007 12:36:12 -0000      1.26.2.1
@@ -270,15 +270,15 @@
 #      io.print("b.delete(\"the\",1);");       # 63  (_90:str)
     eb_a := bat.delete(b,"the",1);     # 64 BKCdelete_bun 
(eb_a:void)<-(b:bat[:str,:int])(_74:str)(_92:int)
 #      io.print("b.delete(\".\",10);");        # 65  (_93:str)
-    fb_a := bat.delete(b,".",10);      # 66 BKCdelete_bun 
(fb_a:void)<-(b:bat[:str,:int])(_60:str)(_61:int)
+    fb_a := bat.delete(b,".",10);      # 66 BKCdelete_bun 
(fb_a:void)<-(b:bat[:str,:int])(_95:str)(_96:int)
 #      io.print("b.print();");         # 67  (_70:str)
     gb_a := io.print(b);       # 68 IOprint_val (gb_a:void)<-(b:bat[:str,:int])
 #      io.print("b.insert(\"fox\",4);");       # 69  (_96:str)
     hb_a := bat.insert(b,"fox",4);     # 70 BKCinsert_bun 
(hb_a:void)<-(b:bat[:str,:int])(_78:str)(_89:int)
 #      io.print("b.insert(\"the\",1);");       # 71  (_98:str)
     ib_a := bat.insert(b,"the",1);     # 72 BKCinsert_bun 
(ib_a:void)<-(b:bat[:str,:int])(_74:str)(_92:int)
-#      io.print("b.insert(\".\",10);");        # 73  (_100:str)
-    jb_a := bat.insert(b,".",10);      # 74 BKCinsert_bun 
(jb_a:void)<-(b:bat[:str,:int])(_102:str)(_103:int)
+#      io.print("b.insert(\".\",10);");        # 73  (_102:str)
+    jb_a := bat.insert(b,".",10);      # 74 BKCinsert_bun 
(jb_a:void)<-(b:bat[:str,:int])(_95:str)(_96:int)
 #      io.print("b.count().print();");         # 75  (_104:str)
     kb_a := aggr.count(b);     # 76 ALGcount_bat (kb_a:int)<-(b:bat[:str,:int])
     lb_a := io.print(kb_a);    # 77 IOprint_val (lb_a:void)<-(kb_a:int)
@@ -354,15 +354,15 @@
     od_a := algebra.fragment(b,"fox",ld_a,md_a,nd_a);  # 147 ALGfragment 
(od_a:bat[:str,:int])<-(b:bat[:str,:int])(_170:str)(ld_a:str)(md_a:int)(nd_a:int)
     pd_a := io.print(od_a);    # 148 IOprint_val 
(pd_a:void)<-(od_a:bat[:str,:int])
 #      io.print("b.fragment(str(nil),\"f\",int(nil),int(nil)).print();");      
# 149  (_188:str)
-    qd_a := calc.str(nil:void);        # 150 CALCnil2str 
(qd_a:str)<-(_155:void)
-    rd_a := calc.int(nil:void);        # 151 CALCnil2int 
(rd_a:int)<-(_155:void)
-    sd_a := calc.int(nil:void);        # 152 CALCnil2int 
(sd_a:int)<-(_192:void)
+    qd_a := calc.str(nil:void);        # 150 CALCnil2str 
(qd_a:str)<-(_190:void)
+    rd_a := calc.int(nil:void);        # 151 CALCnil2int 
(rd_a:int)<-(_190:void)
+    sd_a := calc.int(nil:void);        # 152 CALCnil2int 
(sd_a:int)<-(_190:void)
     td_a := algebra.fragment(b,qd_a,"f",rd_a,sd_a);    # 153 ALGfragment 
(td_a:bat[:str,:int])<-(b:bat[:str,:int])(qd_a:str)(_194:str)(rd_a:int)(sd_a:int)
     ud_a := io.print(td_a);    # 154 IOprint_val 
(ud_a:void)<-(td_a:bat[:str,:int])
 #      
io.print("b.reverse().fragment(int(nil),int(nil),str(nil),\"f\").print();");    
# 155  (_196:str)
-    vd_a := calc.int(nil:void);        # 156 CALCnil2int 
(vd_a:int)<-(_192:void)
-    wd_a := calc.int(nil:void);        # 157 CALCnil2int 
(wd_a:int)<-(_192:void)
-    xd_a := calc.str(nil:void);        # 158 CALCnil2str 
(xd_a:str)<-(_192:void)
+    vd_a := calc.int(nil:void);        # 156 CALCnil2int 
(vd_a:int)<-(_190:void)
+    wd_a := calc.int(nil:void);        # 157 CALCnil2int 
(wd_a:int)<-(_190:void)
+    xd_a := calc.str(nil:void);        # 158 CALCnil2str 
(xd_a:str)<-(_190:void)
     yd_a := bat.reverse(b);    # 159 BKCreverse 
(yd_a:bat[:int,:str])<-(b:bat[:str,:int])
     ae_a := algebra.fragment(yd_a,vd_a,wd_a,xd_a,"f"); # 160 ALGfragment 
(ae_a:bat[:int,:str])<-(yd_a:bat[:int,:str])(vd_a:int)(wd_a:int)(xd_a:str)(_194:str)
     be_a := io.print(ae_a);    # 161 IOprint_val 
(be_a:void)<-(ae_a:bat[:int,:str])

Index: test_40.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_40.stable.out,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -d -r1.31 -r1.31.2.1
--- test_40.stable.out  4 Jul 2007 06:04:56 -0000       1.31
+++ test_40.stable.out  19 Aug 2007 12:36:13 -0000      1.31.2.1
@@ -148,16 +148,16 @@
     ab_a := algebra.fetch(b,8);        # 57 ALGfetchint 
(ab_a:int)<-(b:bat[:int,:int])(_51:int)
     bb_a := io.print(ab_a);    # 58 IOprint_val (bb_a:void)<-(ab_a:int)
 #      io.print("b.slice(5,8).print();");      # 59  (_82:str)
-    cb_a := algebra.slice(b,5,8);      # 60 ALGslice_int 
(cb_a:bat[:int,:int])<-(b:bat[:int,:int])(_77:int)(_51:int)
+    cb_a := algebra.slice(b,5,8);      # 60 ALGslice_int 
(cb_a:bat[:int,:int])<-(b:bat[:int,:int])(_77:int)(_84:int)
     db_a := io.print(cb_a);    # 61 IOprint_val 
(db_a:void)<-(cb_a:bat[:int,:int])
-#      io.print("# errors\n");         # 62  (_85:str)
-    eb_a := algebra.position(b,111);   # 63 ALGposition 
(eb_a:wrd)<-(b:bat[:int,:int])(_87:int)
+#      io.print("# errors\n");         # 62  (_86:str)
+    eb_a := algebra.position(b,111);   # 63 ALGposition 
(eb_a:wrd)<-(b:bat[:int,:int])(_88:int)
     fb_a := io.print(eb_a);    # 64 IOprint_val (fb_a:void)<-(eb_a:wrd)
-#      io.print("b.fetch(-1).print();");       # 65  (_89:str)
-    gb_a := algebra.fetch(b,-1);       # 66 ALGfetchint 
(gb_a:int)<-(b:bat[:int,:int])(_91:int)
+#      io.print("b.fetch(-1).print();");       # 65  (_90:str)
+    gb_a := algebra.fetch(b,-1);       # 66 ALGfetchint 
(gb_a:int)<-(b:bat[:int,:int])(_92:int)
     hb_a := io.print(gb_a);    # 67 IOprint_val (hb_a:void)<-(gb_a:int)
-#      io.print("b.slice(8,5).print();");      # 68  (_93:str)
-    ib_a := algebra.slice(b,8,5);      # 69 ALGslice_int 
(ib_a:bat[:int,:int])<-(b:bat[:int,:int])(_95:int)(_77:int)
+#      io.print("b.slice(8,5).print();");      # 68  (_94:str)
+    ib_a := algebra.slice(b,8,5);      # 69 ALGslice_int 
(ib_a:bat[:int,:int])<-(b:bat[:int,:int])(_84:int)(_77:int)
     jb_a := io.print(ib_a);    # 70 IOprint_val 
(jb_a:void)<-(ib_a:bat[:int,:int])
 #      io.print("quit();");    # 71  (_97:str)
     kb_a := clients.quit();    # 72 CLTquit (kb_a:void)

Index: test_05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_05.stable.out,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -d -r1.26 -r1.26.2.1
--- test_05.stable.out  12 Jun 2007 17:22:24 -0000      1.26
+++ test_05.stable.out  19 Aug 2007 12:36:13 -0000      1.26.2.1
@@ -227,48 +227,48 @@
     kb_a := bat.insert(b,1.20000005,15.6000004);       # 74 BKCinsert_bun 
(kb_a:void)<-(b:bat[:flt,:flt])(_71:flt)(_90:flt)
 #      io.print("b.insert(flt(nil),81.2);");   # 75  (_63:str)
     lb_a := calc.flt(nil:void);        # 76 CALCnil2flt (lb_a:flt)<-(_79:void)
-    mb_a := bat.insert(b,lb_a,81.1999969);     # 77 BKCinsert_bun 
(mb_a:void)<-(b:bat[:flt,:flt])(lb_a:flt)(_66:flt)
-#      io.print("b.count().print();");         # 78  (_101:str)
+    mb_a := bat.insert(b,lb_a,81.1999969);     # 77 BKCinsert_bun 
(mb_a:void)<-(b:bat[:flt,:flt])(lb_a:flt)(_102:flt)
+#      io.print("b.count().print();");         # 78  (_103:str)
     nb_a := aggr.count(b);     # 79 ALGcount_bat (nb_a:int)<-(b:bat[:flt,:flt])
     ob_a := io.print(nb_a);    # 80 IOprint_val (ob_a:void)<-(nb_a:int)
-#      io.print("# Lets cut out a few sections\n");    # 81  (_104:str)
-    pb_a := algebra.select(b,25.6000004,64.5); # 82 ALGselect 
(pb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_106:flt)(_107:flt)
+#      io.print("# Lets cut out a few sections\n");    # 81  (_106:str)
+    pb_a := algebra.select(b,25.6000004,64.5); # 82 ALGselect 
(pb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_108:flt)(_109:flt)
     qb_a := io.print(pb_a);    # 83 IOprint_val 
(qb_a:void)<-(pb_a:bat[:flt,:flt])
-#      io.print("b.select(4.5,15.6).print();");        # 84  (_109:str)
-    rb_a := algebra.select(b,4.5,15.6000004);  # 85 ALGselect 
(rb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_75:flt)(_90:flt)
+#      io.print("b.select(4.5,15.6).print();");        # 84  (_111:str)
+    rb_a := algebra.select(b,4.5,15.6000004);  # 85 ALGselect 
(rb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_113:flt)(_90:flt)
     sb_a := io.print(rb_a);    # 86 IOprint_val 
(sb_a:void)<-(rb_a:bat[:flt,:flt])
-#      io.print("b.select(4.5,4.5).print();");         # 87  (_112:str)
-    tb_a := algebra.select(b,4.5,4.5); # 88 ALGselect 
(tb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_114:flt)(_114:flt)
+#      io.print("b.select(4.5,4.5).print();");         # 87  (_115:str)
+    tb_a := algebra.select(b,4.5,4.5); # 88 ALGselect 
(tb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_113:flt)(_113:flt)
     ub_a := io.print(tb_a);    # 89 IOprint_val 
(ub_a:void)<-(tb_a:bat[:flt,:flt])
-#      io.print("# This should cause an error\n");     # 90  (_82:str)
-    vb_a := algebra.select(b,4.5,3.4000001);   # 91 ALGselect 
(vb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_114:flt)(_117:flt)
+#      io.print("# This should cause an error\n");     # 90  (_118:str)
+    vb_a := algebra.select(b,4.5,3.4000001);   # 91 ALGselect 
(vb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_113:flt)(_120:flt)
     wb_a := io.print(vb_a);    # 92 IOprint_val 
(wb_a:void)<-(vb_a:bat[:flt,:flt])
-#      io.print("b.select(81.2,flt(nil)).print();");   # 93  (_119:str)
-    xb_a := calc.flt(nil:void);        # 94 CALCnil2flt (xb_a:flt)<-(_121:void)
-    yb_a := algebra.select(b,81.1999969,xb_a); # 95 ALGselect 
(yb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_123:flt)(xb_a:flt)
+#      io.print("b.select(81.2,flt(nil)).print();");   # 93  (_122:str)
+    xb_a := calc.flt(nil:void);        # 94 CALCnil2flt (xb_a:flt)<-(_124:void)
+    yb_a := algebra.select(b,81.1999969,xb_a); # 95 ALGselect 
(yb_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_102:flt)(xb_a:flt)
     ac_a := io.print(yb_a);    # 96 IOprint_val 
(ac_a:void)<-(yb_a:bat[:flt,:flt])
-#      io.print("b.select(flt(nil),flt(nil)).print();");       # 97  (_125:str)
-    bc_a := calc.flt(nil:void);        # 98 CALCnil2flt (bc_a:flt)<-(_121:void)
-    cc_a := calc.flt(nil:void);        # 99 CALCnil2flt (cc_a:flt)<-(_121:void)
+#      io.print("b.select(flt(nil),flt(nil)).print();");       # 97  (_127:str)
+    bc_a := calc.flt(nil:void);        # 98 CALCnil2flt (bc_a:flt)<-(_124:void)
+    cc_a := calc.flt(nil:void);        # 99 CALCnil2flt (cc_a:flt)<-(_124:void)
     dc_a := algebra.select(b,bc_a,cc_a);       # 100 ALGselect 
(dc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(bc_a:flt)(cc_a:flt)
     ec_a := io.print(dc_a);    # 101 IOprint_val 
(ec_a:void)<-(dc_a:bat[:flt,:flt])
-#      io.print("# A 2-dimensional cut\n");    # 102  (_130:str)
-    bn := algebra.fragment(b,1.20000005,5.5999999,4.5,15.6000004);     # 103 
ALGfragment 
(bn:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_132:flt)(_133:flt)(_114:flt)(_134:flt)
+#      io.print("# A 2-dimensional cut\n");    # 102  (_132:str)
+    bn := algebra.fragment(b,1.20000005,5.5999999,4.5,15.6000004);     # 103 
ALGfragment 
(bn:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_134:flt)(_135:flt)(_113:flt)(_136:flt)
     fc_a := io.print(bn);      # 104 IOprint_val 
(fc_a:void)<-(bn:bat[:flt,:flt])
-#      io.print("b.fragment(1.2,5.6,16.2,flt(nil)).print();");         # 105  
(_136:str)
-    gc_a := calc.flt(nil:void);        # 106 CALCnil2flt 
(gc_a:flt)<-(_121:void)
-    hc_a := algebra.fragment(b,1.20000005,5.5999999,16.2000008,gc_a);  # 107 
ALGfragment 
(hc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_132:flt)(_133:flt)(_139:flt)(gc_a:flt)
+#      io.print("b.fragment(1.2,5.6,16.2,flt(nil)).print();");         # 105  
(_138:str)
+    gc_a := calc.flt(nil:void);        # 106 CALCnil2flt 
(gc_a:flt)<-(_124:void)
+    hc_a := algebra.fragment(b,1.20000005,5.5999999,16.2000008,gc_a);  # 107 
ALGfragment 
(hc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_134:flt)(_135:flt)(_141:flt)(gc_a:flt)
     ic_a := io.print(hc_a);    # 108 IOprint_val 
(ic_a:void)<-(hc_a:bat[:flt,:flt])
-#      io.print("b.fragment(1.2,flt(nil),16.2,flt(nil)).print();");    # 109  
(_141:str)
-    jc_a := calc.flt(nil:void);        # 110 CALCnil2flt 
(jc_a:flt)<-(_121:void)
-    kc_a := calc.flt(nil:void);        # 111 CALCnil2flt 
(kc_a:flt)<-(_121:void)
-    lc_a := algebra.fragment(b,1.20000005,jc_a,16.2000008,kc_a);       # 112 
ALGfragment 
(lc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_132:flt)(jc_a:flt)(_139:flt)(kc_a:flt)
+#      io.print("b.fragment(1.2,flt(nil),16.2,flt(nil)).print();");    # 109  
(_143:str)
+    jc_a := calc.flt(nil:void);        # 110 CALCnil2flt 
(jc_a:flt)<-(_124:void)
+    kc_a := calc.flt(nil:void);        # 111 CALCnil2flt 
(kc_a:flt)<-(_124:void)
+    lc_a := algebra.fragment(b,1.20000005,jc_a,16.2000008,kc_a);       # 112 
ALGfragment 
(lc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(_134:flt)(jc_a:flt)(_141:flt)(kc_a:flt)
     mc_a := io.print(lc_a);    # 113 IOprint_val 
(mc_a:void)<-(lc_a:bat[:flt,:flt])
-#      io.print("b.fragment(flt(nil),flt(nil),16.2,flt(nil)).print();");       
# 114  (_146:str)
-    nc_a := calc.flt(nil:void);        # 115 CALCnil2flt 
(nc_a:flt)<-(_121:void)
-    oc_a := calc.flt(nil:void);        # 116 CALCnil2flt 
(oc_a:flt)<-(_121:void)
-    pc_a := calc.flt(nil:void);        # 117 CALCnil2flt 
(pc_a:flt)<-(_121:void)
-    qc_a := algebra.fragment(b,nc_a,oc_a,16.2000008,pc_a);     # 118 
ALGfragment 
(qc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(nc_a:flt)(oc_a:flt)(_139:flt)(pc_a:flt)
+#      io.print("b.fragment(flt(nil),flt(nil),16.2,flt(nil)).print();");       
# 114  (_148:str)
+    nc_a := calc.flt(nil:void);        # 115 CALCnil2flt 
(nc_a:flt)<-(_124:void)
+    oc_a := calc.flt(nil:void);        # 116 CALCnil2flt 
(oc_a:flt)<-(_124:void)
+    pc_a := calc.flt(nil:void);        # 117 CALCnil2flt 
(pc_a:flt)<-(_124:void)
+    qc_a := algebra.fragment(b,nc_a,oc_a,16.2000008,pc_a);     # 118 
ALGfragment 
(qc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(nc_a:flt)(oc_a:flt)(_141:flt)(pc_a:flt)
     rc_a := io.print(qc_a);    # 119 IOprint_val 
(rc_a:void)<-(qc_a:bat[:flt,:flt])
 #      io.print("var b1:= b.join(bn.reverse());");     # 120  (_152:str)
     sc_a := bat.reverse(bn);   # 121 BKCreverse 
(sc_a:bat[:flt,:flt])<-(bn:bat[:flt,:flt])
@@ -281,8 +281,8 @@
     uc_a := io.print(b2);      # 128 IOprint_val 
(uc_a:void)<-(b2:bat[:flt,:flt])
 #      io.print("# band join experiment\n");   # 129  (_161:str)
     c := algebra.copy(b);      # 130 ALGcopy 
(c:bat[:flt,:flt])<-(b:bat[:flt,:flt])
-#      io.print("bandjoin(b,c,4.5,4.5).print();");     # 131  (_163:str)
-    vc_a := algebra.bandjoin(b,c,4.5,4.5);     # 132 ALGbandjoin 
(vc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(c:bat[:flt,:flt])(_165:flt)(_165:flt)
+#      io.print("bandjoin(b,c,4.5,4.5).print();");     # 131  (_165:str)
+    vc_a := algebra.bandjoin(b,c,4.5,4.5);     # 132 ALGbandjoin 
(vc_a:bat[:flt,:flt])<-(b:bat[:flt,:flt])(c:bat[:flt,:flt])(_167:flt)(_167:flt)
     wc_a := io.print(vc_a);    # 133 IOprint_val 
(wc_a:void)<-(vc_a:bat[:flt,:flt])
 #      io.print("quit();");    # 134  (_167:str)
     xc_a := clients.quit();    # 135 CLTquit (xc_a:void)

Index: test_70.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/tests/suite_00/Tests/test_70.stable.out,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -d -r1.32 -r1.32.2.1
--- test_70.stable.out  4 Jul 2007 06:04:56 -0000       1.32
+++ test_70.stable.out  19 Aug 2007 12:36:13 -0000      1.32.2.1
@@ -174,19 +174,19 @@
 #      io.print("t2.print();");        # 69  (_99:str)
     cb_a := io.print(t2);      # 70 IOprint_val 
(cb_a:void)<-(t2:bat[:str,:int])
 #      io.print("#It requires a few additional routines\n");   # 71  (_101:str)
-    c := bat.new(nil:int,nil:int);     # 72 CMDBATnew 
(c:bat[:int,:int])<-(_67:int)(_67:int)
-#      io.print("c.insert(1,15);");    # 73  (_103:str)
-    db_a := bat.insert(c,1,15);        # 74 BKCinsert_bun 
(db_a:void)<-(c:bat[:int,:int])(_71:int)(_105:int)
-#      io.print("c.insert(2,15);");    # 75  (_106:str)
-    eb_a := bat.insert(c,2,15);        # 76 BKCinsert_bun 
(eb_a:void)<-(c:bat[:int,:int])(_75:int)(_105:int)
-#      io.print("c.insert(3,int(nil));");      # 77  (_108:str)
-    fb_a := calc.int(nil:void);        # 78 CALCnil2int (fb_a:int)<-(_110:void)
-    gb_a := bat.insert(c,3,fb_a);      # 79 BKCinsert_bun 
(gb_a:void)<-(c:bat[:int,:int])(_78:int)(fb_a:int)
-#      io.print("c.insert(4,0);");     # 80  (_112:str)
-    hb_a := bat.insert(c,4,0); # 81 BKCinsert_bun 
(hb_a:void)<-(c:bat[:int,:int])(_81:int)(_114:int)
-#      io.print("c.insert(5,30);");    # 82  (_115:str)
-    ib_a := bat.insert(c,5,30);        # 83 BKCinsert_bun 
(ib_a:void)<-(c:bat[:int,:int])(_85:int)(_117:int)
-#      io.print("c.print();");         # 84  (_118:str)
+    c := bat.new(nil:int,nil:int);     # 72 CMDBATnew 
(c:bat[:int,:int])<-(_103:int)(_103:int)
+#      io.print("c.insert(1,15);");    # 73  (_104:str)
+    db_a := bat.insert(c,1,15);        # 74 BKCinsert_bun 
(db_a:void)<-(c:bat[:int,:int])(_106:int)(_107:int)
+#      io.print("c.insert(2,15);");    # 75  (_108:str)
+    eb_a := bat.insert(c,2,15);        # 76 BKCinsert_bun 
(eb_a:void)<-(c:bat[:int,:int])(_110:int)(_107:int)
+#      io.print("c.insert(3,int(nil));");      # 77  (_111:str)
+    fb_a := calc.int(nil:void);        # 78 CALCnil2int (fb_a:int)<-(_113:void)
+    gb_a := bat.insert(c,3,fb_a);      # 79 BKCinsert_bun 
(gb_a:void)<-(c:bat[:int,:int])(_115:int)(fb_a:int)
+#      io.print("c.insert(4,0);");     # 80  (_116:str)
+    hb_a := bat.insert(c,4,0); # 81 BKCinsert_bun 
(hb_a:void)<-(c:bat[:int,:int])(_118:int)(_119:int)
+#      io.print("c.insert(5,30);");    # 82  (_120:str)
+    ib_a := bat.insert(c,5,30);        # 83 BKCinsert_bun 
(ib_a:void)<-(c:bat[:int,:int])(_122:int)(_123:int)
+#      io.print("c.print();");         # 84  (_124:str)
     jb_a := io.print(c);       # 85 IOprint_val (jb_a:void)<-(c:bat[:int,:int])
 #      io.print("quit();");    # 86  (_120:str)
     nb_a := clients.quit();    # 87 CLTquit (nb_a:void)


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to