[Getdata-commits] SF.net SVN: getdata:[794] trunk/getdata
Scientific Database Format
Brought to you by:
ketiltrout
Menu
▾
▴
[Getdata-commits] SF.net SVN: getdata:[794] trunk/getdata
|
From: <ket...@us...> - 2013-02-14 04:06:06
|
Revision: 794
http://sourceforge.net/p/getdata/code/794
Author: ketiltrout
Date: 2013-02-14 04:06:02 +0000 (Thu, 14 Feb 2013)
Log Message:
-----------
Test gd_mcarrays in bindings; fix underscores in the rest of the encodings.
Modified Paths:
--------------
trunk/getdata/ChangeLog
trunk/getdata/bindings/cxx/test/big_test.cpp
trunk/getdata/bindings/perl/Makefile.am
trunk/getdata/bindings/perl/t/big_test.t
trunk/getdata/bindings/python/test/big_test.py
trunk/getdata/doc/list.tests
trunk/getdata/src/lzma.c
trunk/getdata/src/slim.c
trunk/getdata/src/zzip.c
Modified: trunk/getdata/ChangeLog
===================================================================
--- trunk/getdata/ChangeLog 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/ChangeLog 2013-02-14 04:06:02 UTC (rev 794)
@@ -1,3 +1,7 @@
+2012-02-02 D. V. Wiebe <ge...@ke...> svn:794
+ * bindings/cxx/test/big_test.cpp bindings/perl/t/big_test.t
+ bindings/python/test/big_test.py: Add test 243.
+
2012-02-02 D. V. Wiebe <ge...@ke...> svn:793
* src/parse.c (_GD_Tokenise): Don't falsely report an unterminated token when
stopping a partial tokenisation on top of a " or \.
Modified: trunk/getdata/bindings/cxx/test/big_test.cpp
===================================================================
--- trunk/getdata/bindings/cxx/test/big_test.cpp 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/bindings/cxx/test/big_test.cpp 2013-02-14 04:06:02 UTC (rev 794)
@@ -144,6 +144,7 @@
"lincom LINCOM data 1.1 2.2 INDEX 2.2 3.3;4.4 linterp const const\n"
"/META data mstr STRING \"This is a string constant.\"\n"
"/META data mconst CONST COMPLEX128 3.3;4.4\n"
+ "/META data mcarray CARRAY FLOAT64 1.9 2.8 3.7 4.6 5.5\n"
"/META data mlut LINTERP DATA ./lut\n"
"const CONST FLOAT64 5.5\n"
"carray CARRAY FLOAT64 1.1 2.2 3.3 4.4 5.5 6.6\n"
@@ -192,6 +193,7 @@
MplexEntry xent, *xep;
Fragment *frag;
gd_triplet_t thresh;
+ const gd_carray_t *carrays;
char* fields[nfields + 9] = {(char*)"INDEX", (char*)"alias", (char*)"bit",
(char*)"carray", (char*)"const", (char*)"data", (char*)"div",
@@ -201,6 +203,13 @@
NULL, NULL};
char *strings[3];
+ unlink(data);
+ unlink(new1);
+ unlink(format);
+ unlink(format1);
+ unlink(form2);
+ rmdir(filedir);
+
// Write the test dirfile
mkdir(filedir, 0777);
@@ -253,12 +262,13 @@
// 9: Dirfile::NFields check
n = d->NMFields("data");
CHECK_OK(9);
- CHECK_INT(9,n,3);
+ CHECK_INT(9,n,4);
// 10: Dirfile::MFieldList check
fields[0] = (char*)"mstr";
fields[1] = (char*)"mconst";
- fields[2] = (char*)"mlut";
+ fields[2] = (char*)"mcarray";
+ fields[3] = (char*)"mlut";
list = d->MFieldList("data");
CHECK_OK(10);
CHECK_STRING_ARRAY(10,n,list[i],fields[i]);
@@ -1281,7 +1291,7 @@
CHECK_DOUBLE_ARRAY(159,1,2,p[i],1.1 * (i + 3));
// 167 gd_carrays
- const gd_carray_t *carrays = d->Carrays(Float64);
+ carrays = d->Carrays(Float64);
CHECK_OK(167);
CHECK_NONNULL(167,carrays);
CHECK_INT2(167,1,carrays[0].n,6);
@@ -1343,6 +1353,23 @@
CHECK_INT2(179,4,ent->ArrayLen(),4);
delete ent;
+ // 180: gd_madd_carray
+ aent.Dissociate();
+ aent.SetName("mnew17");
+ aent.SetFragmentIndex(0);
+ aent.SetType(Float64);
+ aent.SetArrayLen(2);
+ d->MAdd(aent, "data");
+ CHECK_OK2(180,1);
+
+ ent = d->Entry("data/mnew17");
+ CHECK_OK2(180,2);
+ CHECK_INT2(180,1,ent->Type(),CarrayEntryType);
+ CHECK_INT2(180,2,ent->FragmentIndex(),0);
+ CHECK_INT2(180,3,ent->ConstType(),Float64);
+ CHECK_INT2(180,4,ent->ArrayLen(),2);
+ delete ent;
+
// 181 gd_alter_carray
aep = reinterpret_cast<CarrayEntry*>(d->Entry("new17"));
CHECK_OK2(181,1);
@@ -1685,7 +1712,7 @@
n = d->NEntries("data", GD_SCALAR_ENTRIES,
GD_ENTRIES_HIDDEN | GD_ENTRIES_NOALIAS);
CHECK_OK2(237, 1);
- CHECK_INT2(237, 1, n, 2);
+ CHECK_INT2(237, 1, n, 4);
n = d->NEntries(NULL, GD_VECTOR_ENTRIES,
GD_ENTRIES_HIDDEN | GD_ENTRIES_NOALIAS);
CHECK_OK2(237, 2);
@@ -1734,12 +1761,22 @@
CHECK_EOSTRING(241,tok,buf);
free(tok);
+ // 242: gd_carrays
+ carrays = d->MCarrays("data", Float64);
+ CHECK_OK(242);
+ CHECK_NONNULL(242,carrays);
+ CHECK_INT2(242,1,carrays[0].n,5);
+ CHECK_DOUBLE_ARRAY(242,2,5,((double*)carrays[0].d)[i],(1.9 + i * 0.9));
+ CHECK_INT2(242,3,carrays[1].n,2);
+ CHECK_DOUBLE_ARRAY(242,4,2,((double*)carrays[1].d)[i],0);
+ CHECK_INT2(242,5,carrays[2].n,0);
+
// ===================================================================
d->Discard();
delete d;
Modified: trunk/getdata/bindings/perl/Makefile.am
===================================================================
--- trunk/getdata/bindings/perl/Makefile.am 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/bindings/perl/Makefile.am 2013-02-14 04:06:02 UTC (rev 794)
@@ -87,7 +87,7 @@
$(PERL) Build clean; \
fi
rm -f $(BUILT_SOURCES) make_parameters.sed MYMETA.yml MYMETA.json GetData.pm
- rm -rf Build _build MANIFEST build.stamp
+ rm -rf Build _build MANIFEST build.stamp t/*~
uninstall-hook:
rmdir $(DESTDIR)${perlautogetdatadir}
Modified: trunk/getdata/bindings/perl/t/big_test.t
===================================================================
--- trunk/getdata/bindings/perl/t/big_test.t 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/bindings/perl/t/big_test.t 2013-02-14 04:06:02 UTC (rev 794)
@@ -22,7 +22,7 @@
use GetData;
use Math::Complex;
use strict;
-use Test::More tests => 1305;
+use Test::More tests => 1317;
my $ne = 0;
my ($s, @a, %h);
@@ -162,6 +162,7 @@
lincom LINCOM data 1.1 2.2 INDEX 2.2 3.3;4.4 linterp const const
/META data mstr STRING "This is a string constant."
/META data mconst CONST COMPLEX128 3.3;4.4
+/META data mcarray CARRAY FLOAT64 1.9 2.8 3.7 4.6 5.5
/META data mlut LINTERP DATA ./lut
const CONST FLOAT64 5.5
carray CARRAY FLOAT64 1.1 2.2 3.3 4.4 5.5 6.6
@@ -230,12 +231,12 @@
# 9: nmfields check
$s = $_->mfield_list("data");
CheckOK(9);
-CheckNum(9, $s, 3);
+CheckNum(9, $s, 4);
# 10: mfield_list check
@a = $_->mfield_list("data");
CheckOK(10);
-CheckSArray(10, \@a, qw(mstr mconst mlut));
+CheckSArray(10, \@a, qw(mstr mconst mcarray mlut));
# 11: nframes check
$s = $_->nframes;
@@ -1686,7 +1687,7 @@
$s = $_->entry_list("data", $GetData::SCALAR_ENTRIES,
$GetData::ENTRIES_HIDDEN | $GetData::ENTRIES_NOALIAS);
CheckOK2(237, 1);
-CheckNum2(237, 1, $s, 5);
+CheckNum2(237, 1, $s, 6);
$s = $_->entry_list(undef, $GetData::VECTOR_ENTRIES,
$GetData::ENTRIES_HIDDEN | $GetData::ENTRIES_NOALIAS);
CheckOK2(237, 2);
@@ -1709,6 +1710,12 @@
CheckOK(241);
CheckEOString(241, $s, "dirfile/lut");
+# 242: mcarrays
+@a = $_->mcarrays("data", $GetData::FLOAT64);
+CheckOK2(242, 1);
+CheckNum2(242, 2, $#a, 1);
+CheckArray2(242, 3, $a[0], 1.9, 2.8, 3.7, 4.6, 5.5 );
+CheckArray2(242, 4, $a[1], 1.8, 18 );
@@ -1716,5 +1723,6 @@
+
$d = $_ = undef;
system "rm -rf dirfile";
Modified: trunk/getdata/bindings/python/test/big_test.py
===================================================================
--- trunk/getdata/bindings/python/test/big_test.py 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/bindings/python/test/big_test.py 2013-02-14 04:06:02 UTC (rev 794)
@@ -101,6 +101,7 @@
"lincom LINCOM data 1.1 2.2 INDEX 2.2 3.3;4.4 linterp const const\n"
"/META data mstr STRING \"This is a string constant.\"\n"
"/META data mconst CONST COMPLEX128 3.3;4.4\n"
+ "/META data mcarray CARRAY FLOAT64 1.9 2.8 3.7 4.6 5.5\n"
"/META data mlut LINTERP DATA ./lut\n"
"const CONST FLOAT64 5.5\n"
"carray CARRAY FLOAT64 1.1 2.2 3.3 4.4 5.5 6.6\n"
@@ -226,14 +227,14 @@
n = d.nmfields("data")
except:
CheckOK(9)
-CheckSimple(9,n,3)
+CheckSimple(9,n,4)
# 10: mfield_list check
try:
n = d.mfield_list("data")
except:
CheckOK(10)
-CheckSimple(10,n,["mstr", "mconst", "mlut"])
+CheckSimple(10,n,["mstr", "mconst", "mcarray", "mlut"])
# 11: nframes check
try:
@@ -1391,7 +1392,7 @@
CheckSimple2(167,1,len(n),1)
if (pygetdata.__numpy_supported__):
CheckSimple2(167,2,n[0][0],"carray")
- CheckNumpy2(167,2,n[0][1],numpy.arange(1,7))
+ CheckNumpy2(167,3,n[0][1],numpy.arange(1,7))
else:
CheckSimple(167,n,[("carray", [1,2,3,4,5,6])])
@@ -1958,7 +1959,7 @@
pygetdata.ENTRIES_HIDDEN | pygetdata.ENTRIES_NOALIAS)
except:
CheckOK2(237, 1)
-CheckSimple2(237, 1, n, 4)
+CheckSimple2(237, 1, n, 5)
try:
n = d.nentries(type = pygetdata.VECTOR_ENTRIES,
flags = pygetdata.ENTRIES_HIDDEN | pygetdata.ENTRIES_NOALIAS)
@@ -1995,7 +1996,20 @@
CheckOK(241)
CheckEOS(241,n,"dirfile/lut")
+# 242: mcarrays
+try:
+ n = d.mcarrays("data", pygetdata.FLOAT)
+except:
+ CheckOK(242)
+CheckSimple2(242,1,len(n),2)
+if (pygetdata.__numpy_supported__):
+ CheckSimple2(242,2,n[0][0],"mcarray")
+ CheckNumpy2(242,3,n[0][1],1.9 + 0.9 * numpy.arange(0,5))
+ CheckSimple2(242,4,n[1][0],"mnew17")
+ CheckNumpy2(242,5,n[1][1],[0,0])
+else:
+ CheckSimple(242,n,[("mcarray", [1.9, 2.8, 3.7, 4.6, 5.5]), ("mnew17", [0,0])])
@@ -2007,6 +2021,7 @@
+
# ==========================================================================
d.discard()
Modified: trunk/getdata/doc/list.tests
===================================================================
--- trunk/getdata/doc/list.tests 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/doc/list.tests 2013-02-14 04:06:02 UTC (rev 794)
@@ -192,7 +192,7 @@
177 F9CIpPm gd_carray_len
178 F9CIpPm gd_entry (CARRAY)
179 F9CIpPm gd_add_carray
-180 F9.IpPm gd_madd_carray
+180 F9CIpPm gd_madd_carray
181 F9CI.Pm gd_alter_carray
(test 182 is placed after test 40)
183 F9CIpPm gd_constants (INT8)
@@ -254,3 +254,4 @@
239 F9CIpPm gd_entry_list
240 F9CIpPm gd_mplex_lookback
241 F9CIpPm gd_linterp_tablename
+242 ..C-pP- gd_mcarrays
Modified: trunk/getdata/src/lzma.c
===================================================================
--- trunk/getdata/src/lzma.c 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/src/lzma.c 2013-02-14 04:06:02 UTC (rev 794)
@@ -57,7 +57,7 @@
/* The bzip encoding scheme uses edata as a gd_lzmadata pointer. If a file is
* open, idata = 0 otherwise idata = -1. */
-static struct gd_lzmadata *_GD_LzmaDoOpen(int dirfd, struct _gd_raw_file* file)
+static struct gd_lzmadata *_GD_LzmaDoOpen(int dirfd, struct gd_raw_file_* file)
{
struct gd_lzmadata *ptr;
int fd;
@@ -107,8 +107,8 @@
return ptr;
}
-int _GD_LzmaOpen(int dirfd, struct _gd_raw_file* file, int swap __gd_unused,
- unsigned int mode __gd_unused)
+int _GD_LzmaOpen(int dirfd, struct gd_raw_file_* file, int swap gd_unused_,
+ unsigned int mode gd_unused_)
{
struct gd_lzmadata *ptr;
@@ -179,8 +179,8 @@
return 0;
}
-off64_t _GD_LzmaSeek(struct _gd_raw_file* file, off64_t count,
- gd_type_t data_type, unsigned int mode __gd_unused)
+off64_t _GD_LzmaSeek(struct gd_raw_file_* file, off64_t count,
+ gd_type_t data_type, unsigned int mode gd_unused_)
{
struct gd_lzmadata *ptr = (struct gd_lzmadata *)file->edata;
@@ -233,7 +233,7 @@
return file->pos;
}
-ssize_t _GD_LzmaRead(struct _gd_raw_file *file, void *data, gd_type_t data_type,
+ssize_t _GD_LzmaRead(struct gd_raw_file_ *file, void *data, gd_type_t data_type,
size_t nmemb)
{
char* output = (char *)data;
@@ -283,7 +283,7 @@
return nmemb - nbytes / GD_SIZE(data_type);
}
-int _GD_LzmaClose(struct _gd_raw_file *file)
+int _GD_LzmaClose(struct gd_raw_file_ *file)
{
struct gd_lzmadata *ptr = (struct gd_lzmadata *)file->edata;
@@ -303,8 +303,8 @@
return 0;
}
-off64_t _GD_LzmaSize(int dirfd, struct _gd_raw_file *file, gd_type_t data_type,
- int swap __gd_unused)
+off64_t _GD_LzmaSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
+ int swap gd_unused_)
{
struct gd_lzmadata *ptr;
off_t n;
Modified: trunk/getdata/src/slim.c
===================================================================
--- trunk/getdata/src/slim.c 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/src/slim.c 2013-02-14 04:06:02 UTC (rev 794)
@@ -35,8 +35,8 @@
/* The slim encoding scheme uses edata as a slimfile pointer. If a file is
* open, idata = 0 otherwise idata = -1. */
-int _GD_SlimOpen(int dirfd, struct _gd_raw_file* file, int swap __gd_unused,
- unsigned int mode __gd_unused)
+int _GD_SlimOpen(int dirfd, struct gd_raw_file_* file, int swap gd_unused_,
+ unsigned int mode gd_unused_)
{
char *filepath;
@@ -63,8 +63,8 @@
return 0;
}
-off64_t _GD_SlimSeek(struct _gd_raw_file* file, off64_t count,
- gd_type_t data_type, unsigned int mode __gd_unused)
+off64_t _GD_SlimSeek(struct gd_raw_file_* file, off64_t count,
+ gd_type_t data_type, unsigned int mode gd_unused_)
{
off64_t n;
@@ -82,7 +82,7 @@
return n;
}
-ssize_t _GD_SlimRead(struct _gd_raw_file *restrict file, void *restrict ptr,
+ssize_t _GD_SlimRead(struct gd_raw_file_ *restrict file, void *restrict ptr,
gd_type_t data_type, size_t nmemb)
{
ssize_t n;
@@ -95,7 +95,7 @@
return n;
}
-int _GD_SlimClose(struct _gd_raw_file *file)
+int _GD_SlimClose(struct gd_raw_file_ *file)
{
int ret;
@@ -112,8 +112,8 @@
return ret;
}
-off64_t _GD_SlimSize(int dirfd, struct _gd_raw_file *file, gd_type_t data_type,
- int swap __gd_unused)
+off64_t _GD_SlimSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
+ int swap gd_unused_)
{
char *filepath;
off64_t size;
Modified: trunk/getdata/src/zzip.c
===================================================================
--- trunk/getdata/src/zzip.c 2013-02-06 22:47:39 UTC (rev 793)
+++ trunk/getdata/src/zzip.c 2013-02-14 04:06:02 UTC (rev 794)
@@ -36,8 +36,8 @@
/* The zzip encoding scheme looks just like the regular ol' C IO. */
int _GD_ZzipName(DIRFILE *restrict D, const char *restrict enc_data,
- struct _gd_raw_file *restrict file, const char *restrict base,
- int temp __gd_unused, int resolv)
+ struct gd_raw_file_ *restrict file, const char *restrict base,
+ int temp gd_unused_, int resolv)
{
size_t enc_len;
@@ -82,8 +82,8 @@
return 0;
}
-int _GD_ZzipOpen(int dirfd, struct _gd_raw_file* file, int swap __gd_unused,
- unsigned int mode __gd_unused)
+int _GD_ZzipOpen(int dirfd, struct gd_raw_file_* file, int swap gd_unused_,
+ unsigned int mode gd_unused_)
{
char *ptr1, *ptr2;
size_t len;
@@ -122,8 +122,8 @@
return 0;
}
-off64_t _GD_ZzipSeek(struct _gd_raw_file* file, off64_t count,
- gd_type_t data_type, unsigned int mode __gd_unused)
+off64_t _GD_ZzipSeek(struct gd_raw_file_* file, off64_t count,
+ gd_type_t data_type, unsigned int mode gd_unused_)
{
off64_t n;
@@ -139,7 +139,7 @@
return n;
}
-ssize_t _GD_ZzipRead(struct _gd_raw_file *restrict file, void *restrict data,
+ssize_t _GD_ZzipRead(struct gd_raw_file_ *restrict file, void *restrict data,
gd_type_t data_type, size_t nmemb)
{
ssize_t n;
@@ -155,7 +155,7 @@
return n;
}
-int _GD_ZzipClose(struct _gd_raw_file *file)
+int _GD_ZzipClose(struct gd_raw_file_ *file)
{
int ret;
@@ -172,8 +172,8 @@
return ret;
}
-off64_t _GD_ZzipSize(int dirfd, struct _gd_raw_file *file, gd_type_t data_type,
- int swap __gd_unused)
+off64_t _GD_ZzipSize(int dirfd, struct gd_raw_file_ *file, gd_type_t data_type,
+ int swap gd_unused_)
{
ssize_t len;
char *ptr1, *ptr2;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
