Skip to content

Commit

Permalink
rename length -> slen to match SGString change
Browse files Browse the repository at this point in the history
  • Loading branch information
Soeren Sonnenburg committed Jul 28, 2011
1 parent b2464db commit 5fab0e0
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
16 changes: 8 additions & 8 deletions src/interfaces/java_modular/swig_typemaps.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ TYPEMAP_SGMATRIX(float64_t, double, Double, jdouble, "toDoubleArray", "()[[D", "
len = JCALL1(GetArrayLength, jenv, jarr);
max_len = shogun::CMath::max(len, max_len);

strings[i].length=len;
strings[i].slen=len;
strings[i].string=NULL;

if (len >0) {
Expand All @@ -579,16 +579,16 @@ TYPEMAP_SGMATRIX(float64_t, double, Double, jdouble, "toDoubleArray", "()[[D", "
res = JCALL3(NewObjectArray, jenv, num, cls, NULL);

for (i = 0; i < num; i++) {
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].length);
memcpy(data, str[i].string, str[i].length * sizeof(SGTYPE));
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].slen);
memcpy(data, str[i].string, str[i].slen * sizeof(SGTYPE));

##JNITYPE##Array jarr = (##JNITYPE##Array)JCALL1(New##JAVATYPE##Array, jenv, str[i].length);
##JNITYPE##Array jarr = (##JNITYPE##Array)JCALL1(New##JAVATYPE##Array, jenv, str[i].slen);

JNITYPE arr[str[i].length];
for (j = 0; j < str[i].length; j++) {
JNITYPE arr[str[i].slen];
for (j = 0; j < str[i].slen; j++) {
arr[j] = (JNITYPE)data[j];
}
JCALL4(Set##JAVATYPE##ArrayRegion, jenv, jarr, 0, str[i].length, arr);
JCALL4(Set##JAVATYPE##ArrayRegion, jenv, jarr, 0, str[i].slen, arr);
JCALL3(SetObjectArrayElement, jenv, res, i, jarr);
JCALL1(DeleteLocalRef, jenv, jarr);

Expand Down Expand Up @@ -644,7 +644,7 @@ TYPEMAP_STRINGFEATURES(float64_t, double, Double, jdouble, "Doulbe[][]", "[[D")
max_len = shogun::CMath::max(len, max_len);
const char *str = (char *)JCALL2(GetStringUTFChars, jenv, jstr, 0);

strings[i].length = len;
strings[i].slen = len;
strings[i].string = NULL;

if (len > 0) {
Expand Down
10 changes: 5 additions & 5 deletions src/interfaces/lua_modular/swig_typemaps.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ TYPEMAP_SGMATRIX(float64_t)
const char *str = lua_tolstring(L, -1, (size_t *)&len);
max_len = shogun::CMath::max(len, max_len);

strings[i].length = len;
strings[i].slen = len;
strings[i].string = NULL;

if (len > 0) {
Expand All @@ -316,7 +316,7 @@ TYPEMAP_SGMATRIX(float64_t)
len = lua_objlen(L, -1);
max_len = shogun::CMath::max(len, max_len);

strings[i].length=len;
strings[i].slen=len;
strings[i].string=NULL;

if (len > 0) {
Expand Down Expand Up @@ -347,11 +347,11 @@ TYPEMAP_SGMATRIX(float64_t)
lua_rawseti(L, -2, i + 1);
}
else {
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].length);
memcpy(data, str[i].string, str[i].length * sizeof(SGTYPE));
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].slen);
memcpy(data, str[i].string, str[i].slen * sizeof(SGTYPE));

lua_newtable(L);
for (j = 0; j < str[i].length; j++) {
for (j = 0; j < str[i].slen; j++) {
lua_pushnumber(L, (lua_Number)data[j]);
lua_rawseti(L, -2, j + 1);
}
Expand Down
8 changes: 4 additions & 4 deletions src/interfaces/octave_modular/swig_typemaps.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ TYPEMAP_OUT_SGMATRIX(uint16NDArray, uint16_t, uint16_t, "Word")
int32_t len=str.cols();
if (len>0)
{
strings[i].length=len; /* all must have same length in octave */
strings[i].slen=len; /* all must have same length in octave */
strings[i].string=SG_MALLOC(sg_type, len+1); /* not zero terminated in octave */

int32_t j;
Expand All @@ -235,7 +235,7 @@ TYPEMAP_OUT_SGMATRIX(uint16NDArray, uint16_t, uint16_t, "Word")
else
{
/*SG_WARNING( "string with index %d has zero length.\n", i+1);*/
strings[i].length=0;
strings[i].slen=0;
strings[i].string=NULL;
}
}
Expand All @@ -252,7 +252,7 @@ TYPEMAP_OUT_SGMATRIX(uint16NDArray, uint16_t, uint16_t, "Word")
{
if (len>0)
{
strings[i].length=len; /* all must have same length in octave */
strings[i].slen=len; /* all must have same length in octave */
strings[i].string=SG_MALLOC(sg_type, len+1); /* not zero terminated in octave */

int32_t j;
Expand All @@ -263,7 +263,7 @@ TYPEMAP_OUT_SGMATRIX(uint16NDArray, uint16_t, uint16_t, "Word")
else
{
/*SG_WARNING( "string with index %d has zero length.\n", i+1);*/
strings[i].length=0;
strings[i].slen=0;
strings[i].string=NULL;
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/interfaces/r_modular/swig_typemaps.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,13 +176,13 @@ TYPEMAP_OUT_SGMATRIX(INTSXP, INTEGER, uint16_t, int, "Word")
/*ASSERT(strs[i].string);*/
strs[i].string=(sg_type*) memcpy(dst, c, len*sizeof(sg_type));
strs[i].string[len]='\0'; /* zero terminate */
strs[i].length=len;
strs[i].slen=len;
max_len=CMath::max(max_len, len);
}
else
{
/*SG_WARNING( "string with index %d has zero length.\n", i+1);*/
strs[i].length=0;
strs[i].slen=0;
strs[i].string=NULL;
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/interfaces/ruby_modular/swig_typemaps.i
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ TYPEMAP_SGMATRIX(float64_t, NUM2DBL, rb_float_new)
const char *str = StringValuePtr(arr);
max_len = shogun::CMath::max(len, max_len);

strings[i].length = len;
strings[i].slen = len;
strings[i].string = NULL;

if (len > 0) {
Expand All @@ -208,7 +208,7 @@ TYPEMAP_SGMATRIX(float64_t, NUM2DBL, rb_float_new)
len = RARRAY_LEN(arr);
max_len = shogun::CMath::max(len, max_len);

strings[i].length=len;
strings[i].slen=len;
strings[i].string=NULL;
if (len > 0) {
strings[i].string = SG_MALLOC(SGTYPE, len);
Expand Down Expand Up @@ -243,11 +243,11 @@ TYPEMAP_SGMATRIX(float64_t, NUM2DBL, rb_float_new)
rb_ary_push(arr, vec);
}
else {
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].length);
memcpy(data, str[i].string, str[i].length * sizeof(SGTYPE));
SGTYPE* data = SG_MALLOC(SGTYPE, str[i].slen);
memcpy(data, str[i].string, str[i].slen * sizeof(SGTYPE));

VALUE vec = rb_ary_new2(str[i].length);
for (j = 0; j < str[i].length; j++) {
VALUE vec = rb_ary_new2(str[i].slen);
for (j = 0; j < str[i].slen; j++) {
rb_ary_push(vec, SG2R(data[j]));
}
rb_ary_push(arr, vec);
Expand Down

0 comments on commit 5fab0e0

Please sign in to comment.