Changeset: b0f1d6607885 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b0f1d6607885
Modified Files:
sql/backends/monet5/sciql.mx
sql/test/sciql/Tests/Msci00.mal
sql/test/sciql/Tests/Msci01.mal
Branch: sciql
Log Message:
First sciql primitives added
diffs (154 lines):
diff -r b81d368619a6 -r b0f1d6607885 sql/backends/monet5/sciql.mx
--- a/sql/backends/monet5/sciql.mx Sun Jan 16 21:00:20 2011 +0100
+++ b/sql/backends/monet5/sciql.mx Sun Jan 16 22:00:26 2011 +0100
@@ -25,35 +25,35 @@
This current focus is on testing the code generation.
@mal
module sciql;
-pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_0,
stop:any_0, step:any_0):bat[:oid,:any_0]
+pattern newDimension(sch:str, tab:str, col:str, kind:int, start:any_1,
stop:any_1, step:any_1):bat[:oid,:any_1]
address SCI1D
comment "Define the dimension of a vector";
pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1
-)(:bat[:oid,:any_0], :bat[:oid,:any_1])
+ start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2
+)(:bat[:oid,:any_1], :bat[:oid,:any_2])
address SCI2D
comment "Define the dimensions of a 2D space";
pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1,
- col2:str, start2:any_2, stop2:any_2, step2:any_2
-)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2]);
+ start1:any_1, stop1:any_1, step1:any_1,
+ col2:str, start2:any_2, stop2:any_2, step2:any_2,
+ col3:str, start3:any_3, stop3:any_3, step3:any_3
+)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3])
address SCI3D
comment "Define the dimensions of a 3D space";
pattern newDimension(sch:str, tab:str, col:str, kind:int,
- start0:any_0, stop0:any_0, step0:any_0,
- col1:str, start1:any_1, stop1:any_1, step1:any_1,
+ start1:any_1, stop1:any_1, step1:any_1,
col2:str, start2:any_2, stop2:any_2, step2:any_2,
- col3:str, start3:any_3, stop3:any_3, step3:any_3
-)(:bat[:oid,:any_0], :bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3]);
+ col3:str, start3:any_3, stop3:any_3, step3:any_3,
+ col4:str, start4:any_4, stop4:any_4, step4:any_4
+)(:bat[:oid,:any_1], :bat[:oid,:any_2], :bat[:oid,:any_3], :bat[:oid,:any_4])
address SCI3D
comment "Define the dimensions of a 4D space";
-pattern setDefault(b:bat[:oid,:any_0], def:any_1):bat[:oid,:any_1]
+pattern setDefault(b:bat[:oid,:any_1], def:any_2):bat[:oid,:any_2]
address SCIsetDefault
comment "Create an array instance initialized with default values);
@h
@@ -75,47 +75,47 @@
#include "sql_mvc.h"
#include "bat5.h"
-sql5_export str SQL1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+str SCI1D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
(void) mb;
(void) stk;
- (void) pic;
+ (void) pci;
throw(MAL,"sciql.newDimension",PROGRAM_NYI);
}
-sql5_export str SQL2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+str SCI2D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
(void) mb;
(void) stk;
- (void) pic;
+ (void) pci;
throw(MAL,"sciql.newDimension",PROGRAM_NYI);
}
-sql5_export str SQL3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+str SCI3D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
(void) mb;
(void) stk;
- (void) pic;
+ (void) pci;
throw(MAL,"sciql.newDimension",PROGRAM_NYI);
}
-sql5_export str SQL4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+str SCI4D(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
(void) mb;
(void) stk;
- (void) pic;
+ (void) pci;
throw(MAL,"sciql.newDimension",PROGRAM_NYI);
}
-sql5_export str SQLdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
+str SCIdefault(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
(void) cntxt;
(void) mb;
(void) stk;
- (void) pic;
+ (void) pci;
throw(MAL,"sciql.setDefault",PROGRAM_NYI);
}
diff -r b81d368619a6 -r b0f1d6607885 sql/test/sciql/Tests/Msci00.mal
--- a/sql/test/sciql/Tests/Msci00.mal Sun Jan 16 21:00:20 2011 +0100
+++ b/sql/test/sciql/Tests/Msci00.mal Sun Jan 16 22:00:26 2011 +0100
@@ -1,12 +1,12 @@
#CREATE ARRAY A1( x integer DIMENSION[4], val float DEFAULT 0.0);
#additional operations required for explicit indices
-x:bat[:oid,:int]:= array.newDimension("sys","A1","x",0,0,4,1);
+x:bat[:oid,:int]:= sciql.newDimension("sys","A1","x",0,0,4,1);
#CREATE ARRAY A2 ( x integer DIMENSION[0:4:1], val float DEFAULT 0.0);
#additional operations required for explicit indices
-x:bat[:oid,:int]:= array.newDimension("sys","A2","x",0,0,4,1);
+x:bat[:oid,:int]:= sciql.newDimension("sys","A2","x",0,0,4,1);
CREATE SEQUENCE range AS integer START WITH 0 INCREMENT BY 1 MAXVALUE 3;
#CREATE ARRAY A3 ( x integer DIMENSION range, val float DEFAULT 0.0);
#additional operations required for explicit indices
-x:bat[:oid,:int]:= array.newDimension("sys","A3","x",0,0,4,1);
+x:bat[:oid,:int]:= sciql.newDimension("sys","A3","x",0,0,4,1);
diff -r b81d368619a6 -r b0f1d6607885 sql/test/sciql/Tests/Msci01.mal
--- a/sql/test/sciql/Tests/Msci01.mal Sun Jan 16 21:00:20 2011 +0100
+++ b/sql/test/sciql/Tests/Msci01.mal Sun Jan 16 22:00:26 2011 +0100
@@ -1,17 +1,17 @@
#CREATE ARRAY matrix ( x integer DIMENSION[4], y integer DIMENSION[4], val
float DEFAULT 0.0 );
#additional operations required for explicit indices
-(x:bat[:oid,:int],y:bat[:oid,:int]) :=
array.newDimension("sys","matrix","x",0,0,4,1,0,4,1);
+(x:bat[:oid,:int],y:bat[:oid,:int]) :=
sciql.newDimension("sys","matrix","x",0,0,4,1,"y",0,4,1);
#CREATE ARRAY grid( x integer DIMENSION[4] CHECK(mod(x,2) = 0), y integer
DIMENSION[4], val float DEFAULT 0.0);
#additional operations required for explicit indices
-(x:bat[:oid,:int],y:bat[:oid,:int]) :=
array.newDimension("sys","grid","x",0,0,4,1,0,4,1);
+(x:bat[:oid,:int],y:bat[:oid,:int]) :=
sciql.newDimension("sys","grid","x",0,0,4,1,"y",0,4,1);
#CREATE ARRAY diagonal( x integer DIMENSION[4], y integer DIMENSION[4] CHECK(x
= y), val float );
#additional operations required for explicit indices
-(x:bat[:oid,:int],y:bat[:oid,:int]) :=
array.newDimension("sys","diagonal","x",0,0,4,1,0,4,1);
+(x:bat[:oid,:int],y:bat[:oid,:int]) :=
sciql.newDimension("sys","diagonal","x",0,0,4,1,"y",0,4,1);
#CREATE ARRAY sparse( x integer DIMENSION[4], y integer DIMENSION[4], val
float DEFAULT 0.0 CHECK(val>0));
#additional operations required for explicit indices
-(x:bat[:oid,:int],y:bat[:oid,:int]) :=
array.newDimension("sys","sparse","x",0,0,4,1,0,4,1);
+(x:bat[:oid,:int],y:bat[:oid,:int]) :=
sciql.newDimension("sys","sparse","x",0,0,4,1,"y",0,4,1);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
