Changeset: da686b4181c1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da686b4181c1 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: stratified_sampling Log Message:
Approve exports. diffs (73 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -8270,8 +8270,10 @@ Ready. [ "sabaoth", "marchScenario", "command sabaoth.marchScenario(lang:str):void ", "SABmarchScenario;", "Publishes the given language as available for this server" ] [ "sabaoth", "prelude", "command sabaoth.prelude():void ", "SABprelude;", "Initialise the sabaoth module" ] [ "sabaoth", "retreatScenario", "command sabaoth.retreatScenario(lang:str):void ", "SABretreatScenario;", "Unpublishes the given language as available for this server" ] -[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s" ] -[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0" ] +[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample (without replacement) of size s" ] +[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample (without replacement) of size = (p x count(b)), where 0 <= p <= 1.0" ] +[ "sample", "subweighted", "command sample.subweighted(b:bat[:any], s:lng, w:bat[:any]):bat[:oid] ", "SAMPLEweighted;", "Returns the oids of a weighted sample (without replacement) of size s" ] +[ "sample", "subweighted", "command sample.subweighted(b:bat[:any], p:dbl, w:bat[:any]):bat[:oid] ", "SAMPLEweighted_dbl;", "Returns the oids of a weighted sample (without replacement) of size = (p x count(b)), where 0 <= p <= 1.0" ] [ "shp", "attach", "pattern shp.attach(filename:str):void ", "SHPattach;", "Register an ESRI Shapefile in the vault catalog" ] [ "shp", "import", "pattern shp.import(fileid:int):void ", "SHPimport;", "Import an ESRI Shapefile with given id into the vault" ] [ "shp", "import", "pattern shp.import(fileid:int, po:wkb):void ", "SHPpartialimport;", "Partially import an ESRI Shapefile with given id into the vault" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -10632,8 +10632,10 @@ Ready. [ "sabaoth", "marchScenario", "command sabaoth.marchScenario(lang:str):void ", "SABmarchScenario;", "Publishes the given language as available for this server" ] [ "sabaoth", "prelude", "command sabaoth.prelude():void ", "SABprelude;", "Initialise the sabaoth module" ] [ "sabaoth", "retreatScenario", "command sabaoth.retreatScenario(lang:str):void ", "SABretreatScenario;", "Unpublishes the given language as available for this server" ] -[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample of size s" ] -[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample of size = (p x count(b)), where 0 <= p <= 1.0" ] +[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], s:lng):bat[:oid] ", "SAMPLEuniform;", "Returns the oids of a uniform sample (without replacement) of size s" ] +[ "sample", "subuniform", "command sample.subuniform(b:bat[:any], p:dbl):bat[:oid] ", "SAMPLEuniform_dbl;", "Returns the oids of a uniform sample (without replacement) of size = (p x count(b)), where 0 <= p <= 1.0" ] +[ "sample", "subweighted", "command sample.subweighted(b:bat[:any], s:lng, w:bat[:any]):bat[:oid] ", "SAMPLEweighted;", "Returns the oids of a weighted sample (without replacement) of size s" ] +[ "sample", "subweighted", "command sample.subweighted(b:bat[:any], p:dbl, w:bat[:any]):bat[:oid] ", "SAMPLEweighted_dbl;", "Returns the oids of a weighted sample (without replacement) of size = (p x count(b)), where 0 <= p <= 1.0" ] [ "shp", "attach", "pattern shp.attach(filename:str):void ", "SHPattach;", "Register an ESRI Shapefile in the vault catalog" ] [ "shp", "import", "pattern shp.import(fileid:int):void ", "SHPimport;", "Import an ESRI Shapefile with given id into the vault" ] [ "shp", "import", "pattern shp.import(fileid:int, po:wkb):void ", "SHPpartialimport;", "Partially import an ESRI Shapefile with given id into the vault" ] diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -180,6 +180,7 @@ BAT *BATthetaselect(BAT *b, BAT *s, cons void BATtseqbase(BAT *b, oid o); void BATundo(BAT *b); BAT *BATunique(BAT *b, BAT *s); +BAT *BATweightedsample(BAT *b, BUN n, BAT *w); BBPrec *BBP[N_BBPINIT]; void BBPaddfarm(const char *dirname, int rolemask); void BBPclear(bat bid); @@ -454,6 +455,12 @@ char *msab_registerStop(void); char *msab_retreatScenario(const char *lang); char *msab_serialise(char **ret, const sabdb *db); char *msab_wildRetreat(void); +double mtwist_drand(mtwist *mt); +void mtwist_free(mtwist *mt); +mtwist *mtwist_new(void); +void mtwist_seed(mtwist *mt, unsigned int seed); +unsigned int mtwist_u32rand(mtwist *mt); +int mtwist_uniform_int(mtwist *mt, int a, int b); float nextafterf(float x, float y); const oid oid_nil; DIR *opendir(const char *dirname); @@ -1653,6 +1660,8 @@ str SABprelude(void *ret); str SABretreatScenario(void *ret, str *lang); str SAMPLEuniform(bat *r, bat *b, lng *s); str SAMPLEuniform_dbl(bat *r, bat *b, dbl *p); +str SAMPLEweighted(bat *r, bat *b, lng *s, bat *w); +str SAMPLEweighted_dbl(bat *r, bat *b, dbl *p, bat *w); str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str SERVERclient(void *res, const Stream *In, const Stream *Out); str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); @@ -2546,6 +2555,7 @@ str subprodRef; str subsliceRef; str subsumRef; str subuniformRef; +str subweightedRef; str sumRef; str takeOid(oid id, str *val); str takeRef; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
