Menu
▾
▴
[Octave-cvsupdate] SF.net SVN: octave:[5518] trunk/octave-forge/main
|
From: <xav...@us...> - 2009-01-10 01:02:42
|
Revision: 5518
http://octave.svn.sourceforge.net/octave/?rev=5518&view=rev
Author: xavier98
Date: 2009-01-10 01:02:37 +0000 (Sat, 10 Jan 2009)
Log Message:
-----------
Bring swig wrappers up to date, and fix/suppress mysql build error in ubuntu 8.10.
Modified Paths:
--------------
trunk/octave-forge/main/ann/DESCRIPTION
trunk/octave-forge/main/ann/src/ann/bindings/ann_wrap.cpp
trunk/octave-forge/main/database/DESCRIPTION
trunk/octave-forge/main/database/src/mysql.i
trunk/octave-forge/main/database/src/mysql_filtered.h
trunk/octave-forge/main/database/src/mysql_wrap.cpp
trunk/octave-forge/main/database/src/odbc_wrap.cpp
trunk/octave-forge/main/database/src/postgres_wrap.cpp
trunk/octave-forge/main/database/src/sqlite3_wrap.cpp
trunk/octave-forge/main/ftp/DESCRIPTION
trunk/octave-forge/main/ftp/src/ftp_wrap.cpp
Modified: trunk/octave-forge/main/ann/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/ann/DESCRIPTION 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/ann/DESCRIPTION 2009-01-10 01:02:37 UTC (rev 5518)
@@ -1,6 +1,6 @@
Name: ANN
-Version: 1.0.1
-Date: 2008-08-23
+Version: 1.0.2
+Date: 2009-01-09
Author: Various Authors
Maintainer: Xavier Delacour
Title: Approximate Nearest Neighbor Library
Modified: trunk/octave-forge/main/ann/src/ann/bindings/ann_wrap.cpp
===================================================================
--- trunk/octave-forge/main/ann/src/ann/bindings/ann_wrap.cpp 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/ann/src/ann/bindings/ann_wrap.cpp 2009-01-10 01:02:37 UTC (rev 5518)
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.37
*
* This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make
@@ -8,22 +8,27 @@
* interface file instead.
* ----------------------------------------------------------------------------- */
+#define SWIGOCTAVE
#define SWIG_name_d "ann"
#define SWIG_name ann
+
#ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
template<typename T> class SwigValueWrapper {
- T *tt;
+ struct SwigMovePointer {
+ T *ptr;
+ SwigMovePointer(T *p) : ptr(p) { }
+ ~SwigMovePointer() { delete ptr; }
+ SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+ } pointer;
+ SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+ SwigValueWrapper(const SwigValueWrapper<T>& rhs);
public:
- SwigValueWrapper() : tt(0) { }
- SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
- SwigValueWrapper(const T& t) : tt(new T(t)) { }
- ~SwigValueWrapper() { delete tt; }
- SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
- operator T&() const { return *tt; }
- T *operator&() { return tt; }
-private:
- SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+ SwigValueWrapper() : pointer(0) { }
+ SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+ operator T&() const { return *pointer.ptr; }
+ T *operator&() { return pointer.ptr; }
};
template <typename T> T SwigValueInit() {
@@ -73,6 +78,12 @@
# endif
#endif
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+# pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
#ifndef SWIGUNUSEDPARM
# ifdef __cplusplus
# define SWIGUNUSEDPARM(p)
@@ -139,11 +150,12 @@
#include <octave/parse.h>
#include <octave/ov-fcn-handle.h>
#include <octave/Cell.h>
+#include <octave/oct-map.h>
/* -----------------------------------------------------------------------------
* swigrun.swg
*
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
* type checking.
* ----------------------------------------------------------------------------- */
@@ -162,11 +174,11 @@
/*
You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
- creating a static or dynamic library from the swig runtime code.
- In 99.9% of the cases, swig just needs to declare them as 'static'.
+ creating a static or dynamic library from the SWIG runtime code.
+ In 99.9% of the cases, SWIG just needs to declare them as 'static'.
- But only do this if is strictly necessary, ie, if you have problems
- with your compiler or so.
+ But only do this if strictly necessary, ie, if you have problems
+ with your compiler or suchlike.
*/
#ifndef SWIGRUNTIME
@@ -193,14 +205,14 @@
/*
Flags/methods for returning states.
- The swig conversion methods, as ConvertPtr, return and integer
+ The SWIG conversion methods, as ConvertPtr, return and integer
that tells if the conversion was successful or not. And if not,
an error code can be returned (see swigerrors.swg for the codes).
Use the following macros/flags to set or process the returning
states.
- In old swig versions, you usually write code as:
+ In old versions of SWIG, code such as the following was usually written:
if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
// success code
@@ -208,7 +220,7 @@
//fail code
}
- Now you can be more explicit as:
+ Now you can be more explicit:
int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
if (SWIG_IsOK(res)) {
@@ -217,7 +229,7 @@
// fail code
}
- that seems to be the same, but now you can also do
+ which is the same really, but now you can also do
Type *ptr;
int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -235,7 +247,7 @@
I.e., now SWIG_ConvertPtr can return new objects and you can
identify the case and take care of the deallocation. Of course that
- requires also to SWIG_ConvertPtr to return new result values, as
+ also requires SWIG_ConvertPtr to return new result values, such as
int SWIG_ConvertPtr(obj, ptr,...) {
if (<obj is ok>) {
@@ -253,7 +265,7 @@
Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
- swig errors code.
+ SWIG errors code.
Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
allows to return the 'cast rank', for example, if you have this
@@ -267,9 +279,8 @@
fooi(1) // cast rank '0'
just use the SWIG_AddCast()/SWIG_CheckState()
+*/
-
- */
#define SWIG_OK (0)
#define SWIG_ERROR (-1)
#define SWIG_IsOK(r) (r >= 0)
@@ -294,7 +305,6 @@
#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
-
/* Cast-Rank Mode */
#if defined(SWIG_CASTRANK_MODE)
# ifndef SWIG_TypeRank
@@ -317,8 +327,6 @@
#endif
-
-
#include <string.h>
#ifdef __cplusplus
@@ -415,40 +423,58 @@
}
-/* think of this as a c++ template<> or a scheme macro */
-#define SWIG_TypeCheck_Template(comparison, ty) \
- if (ty) { \
- swig_cast_info *iter = ty->cast; \
- while (iter) { \
- if (comparison) { \
- if (iter == ty->cast) return iter; \
- /* Move iter to the top of the linked list */ \
- iter->prev->next = iter->next; \
- if (iter->next) \
- iter->next->prev = iter->prev; \
- iter->next = ty->cast; \
- iter->prev = 0; \
- if (ty->cast) ty->cast->prev = iter; \
- ty->cast = iter; \
- return iter; \
- } \
- iter = iter->next; \
- } \
- } \
- return 0
-
/*
Check the typename
*/
SWIGRUNTIME swig_cast_info *
SWIG_TypeCheck(const char *c, swig_type_info *ty) {
- SWIG_TypeCheck_Template(strcmp(iter->type->name, c) == 0, ty);
+ if (ty) {
+ swig_cast_info *iter = ty->cast;
+ while (iter) {
+ if (strcmp(iter->type->name, c) == 0) {
+ if (iter == ty->cast)
+ return iter;
+ /* Move iter to the top of the linked list */
+ iter->prev->next = iter->next;
+ if (iter->next)
+ iter->next->prev = iter->prev;
+ iter->next = ty->cast;
+ iter->prev = 0;
+ if (ty->cast) ty->cast->prev = iter;
+ ty->cast = iter;
+ return iter;
+ }
+ iter = iter->next;
+ }
+ }
+ return 0;
}
-/* Same as previous function, except strcmp is replaced with a pointer comparison */
+/*
+ Identical to SWIG_TypeCheck, except strcmp is replaced with a pointer comparison
+*/
SWIGRUNTIME swig_cast_info *
-SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *into) {
- SWIG_TypeCheck_Template(iter->type == from, into);
+SWIG_TypeCheckStruct(swig_type_info *from, swig_type_info *ty) {
+ if (ty) {
+ swig_cast_info *iter = ty->cast;
+ while (iter) {
+ if (iter->type == from) {
+ if (iter == ty->cast)
+ return iter;
+ /* Move iter to the top of the linked list */
+ iter->prev->next = iter->next;
+ if (iter->next)
+ iter->next->prev = iter->prev;
+ iter->next = ty->cast;
+ iter->prev = 0;
+ if (ty->cast) ty->cast->prev = iter;
+ ty->cast = iter;
+ return iter;
+ }
+ iter = iter->next;
+ }
+ }
+ return 0;
}
/*
@@ -1318,7 +1344,7 @@
// index operator
else {
if (ops[skip] == '(' || ops[skip] == '{') {
- const char *op_name = ops[skip] == '(' ? "__paren" : "__brace";
+ const char *op_name = ops[skip] == '(' ? "__paren__" : "__brace__";
octave_value_list args;
args.append(*idx_it++);
++skip;
@@ -1357,7 +1383,7 @@
}
else if (ops[skip] == '(' || ops[skip] == '{') {
- const char *op_name = ops[skip] == '(' ? "__paren_asgn" : "__brace_asgn";
+ const char *op_name = ops[skip] == '(' ? "__paren_asgn__" : "__brace_asgn__";
member_value_pair *m = find_member(op_name, false);
if (m) {
octave_value_list args;
@@ -1395,40 +1421,27 @@
virtual bool is_string() const {
octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
- return !!nc_this->find_member("__str", false);
+ return !!nc_this->find_member("__str__", false);
}
virtual std::string string_value(bool force = false) const {
octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
- member_value_pair *m = nc_this->find_member("__str", false);
+ member_value_pair *m = nc_this->find_member("__str__", false);
if (!m) {
- error("__str method not defined");
+ error("__str__ method not defined");
return std::string();
}
octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
if (outarg.length() < 1 || !outarg(0).is_string()) {
- error("__str method did not return a string");
+ error("__str__ method did not return a string");
return std::string();
}
return outarg(0).string_value();
}
- /*
virtual Octave_map map_value() const {
- octave_swig_type *nc_this = const_cast < octave_swig_type *>(this);
- member_value_pair *m = nc_this->find_member("__str", false);
- if (!m) {
- error("__map method not defined");
- return std::string();
- }
- octave_value_list outarg = nc_this->member_invoke(m, octave_value_list(nc_this->as_value()), 1);
- if (outarg.length() < 1 || !outarg(0).is_map()) {
- error("__map method did not return a string");
- return std::string();
- }
- return outarg(0).map_value();
+ return Octave_map();
}
- */
virtual string_vector map_keys() const {
member_map tmp;
@@ -1442,6 +1455,35 @@
return keys;
}
+ virtual bool save_ascii (std::ostream& os) {
+ return true;
+ }
+
+ virtual bool load_ascii (std::istream& is) {
+ return true;
+ }
+
+ virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+ return true;
+ }
+
+ virtual bool load_binary (std::istream& is, bool swap,
+ oct_mach_info::float_format fmt) {
+ return true;
+ }
+
+#if defined (HAVE_HDF5)
+ virtual bool
+ save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+ return true;
+ }
+
+ virtual bool
+ load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+ return true;
+ }
+#endif
+
virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const {
return string_value();
}
@@ -1466,7 +1508,7 @@
assert(ost);
octave_value ret;
- if (ost->dispatch_unary_op(std::string("__") + op_name, ret))
+ if (ost->dispatch_unary_op(std::string("__") + op_name + std::string("__"), ret))
return ret;
std::string symbol = "op_" + ost->swig_type_name() + "_" + op_name;
octave_value_list args;
@@ -1483,7 +1525,7 @@
octave_swig_type *rhs_ost = Swig::swig_value_deref(rhs);
octave_value ret;
- if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name, rhs, ret))
+ if (lhs_ost && lhs_ost->dispatch_binary_op(std::string("__") + op_name + std::string("__"), rhs, ret))
return ret;
std::string symbol;
@@ -1605,9 +1647,35 @@
virtual std::string string_value(bool force = false) const
{ return ptr->string_value(force); }
+ virtual Octave_map map_value() const
+ { return ptr->map_value(); }
+
virtual string_vector map_keys() const
{ return ptr->map_keys(); }
+ virtual bool save_ascii (std::ostream& os)
+ { return ptr->save_ascii(os); }
+
+ virtual bool load_ascii (std::istream& is)
+ { return ptr->load_ascii(is); }
+
+ virtual bool save_binary (std::ostream& os, bool& save_as_floats)
+ { return ptr->save_binary(os, save_as_floats); }
+
+ virtual bool load_binary (std::istream& is, bool swap,
+ oct_mach_info::float_format fmt)
+ { return ptr->load_binary(is, swap, fmt); }
+
+#if defined (HAVE_HDF5)
+ virtual bool
+ save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
+ { return ptr->save_hdf5(loc_id, name, save_as_floats); }
+
+ virtual bool
+ load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug)
+ { return ptr->load_hdf5(loc_id, name, have_h5giterate_bug); }
+#endif
+
virtual octave_value convert_to_str(bool pad = false, bool force = false, char type = '"') const
{ return ptr->convert_to_str(pad, force, type); }
@@ -1656,6 +1724,37 @@
void print(std::ostream &os, bool pr_as_read_syntax = false) const {
os << "swig packed type: name = " << (type ? type->name : std::string()) << ", len = " << buf.size() << std::endl;
}
+
+
+ virtual bool save_ascii (std::ostream& os) {
+ return true;
+ }
+
+ virtual bool load_ascii (std::istream& is) {
+ return true;
+ }
+
+ virtual bool save_binary (std::ostream& os, bool& save_as_floats) {
+ return true;
+ }
+
+ virtual bool load_binary (std::istream& is, bool swap,
+ oct_mach_info::float_format fmt) {
+ return true;
+ }
+
+#if defined (HAVE_HDF5)
+ virtual bool
+ save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) {
+ return true;
+ }
+
+ virtual bool
+ load_hdf5 (hid_t loc_id, const char *name, bool have_h5giterate_bug) {
+ return true;
+ }
+#endif
+
private:
DECLARE_OCTAVE_ALLOCATOR;
DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA;
@@ -2047,7 +2146,7 @@
/* -------- TYPES TABLE (END) -------- */
-#define SWIGVERSION 0x010335
+#define SWIGVERSION 0x010337
#define SWIG_VERSION SWIGVERSION
@@ -2294,12 +2393,12 @@
int arg1 ;
ANNpoint arg2 = (ANNpoint) 0 ;
ANNpoint arg3 = (ANNpoint) 0 ;
- ANNdist result;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNdist result;
if (!SWIG_check_num_args("annDist",args.length(),3,3,0)) {
SWIG_fail;
@@ -2346,7 +2445,6 @@
static octave_value_list _wrap_annAllocPt__SWIG_0 (const octave_value_list& args, int nargout) {
int arg1 ;
ANNcoord arg2 ;
- ANNpoint result;
int val1 ;
int ecode1 = 0 ;
double val2 ;
@@ -2354,6 +2452,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpoint result;
if (!SWIG_check_num_args("annAllocPt",args.length(),2,2,0)) {
SWIG_fail;
@@ -2384,12 +2483,12 @@
static octave_value_list _wrap_annAllocPt__SWIG_1 (const octave_value_list& args, int nargout) {
int arg1 ;
- ANNpoint result;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpoint result;
if (!SWIG_check_num_args("annAllocPt",args.length(),1,1,0)) {
SWIG_fail;
@@ -2454,7 +2553,6 @@
static octave_value_list _wrap_annAllocPts (const octave_value_list& args, int nargout) {
int arg1 ;
int arg2 ;
- ANNpointArray result;
int val1 ;
int ecode1 = 0 ;
int val2 ;
@@ -2462,6 +2560,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpointArray result;
if (!SWIG_check_num_args("annAllocPts",args.length(),2,2,0)) {
SWIG_fail;
@@ -2559,12 +2658,12 @@
static octave_value_list _wrap_annCopyPt (const octave_value_list& args, int nargout) {
int arg1 ;
ANNpoint arg2 = (ANNpoint) 0 ;
- ANNpoint result;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpoint result;
if (!SWIG_check_num_args("annCopyPt",args.length(),2,2,0)) {
SWIG_fail;
@@ -2616,8 +2715,7 @@
arg1 = (ANNpointSet *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -2829,7 +2927,6 @@
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
double arg7 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -2839,6 +2936,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNpointSet_annkFRSearch",args.length(),5,5,0)) {
SWIG_fail;
@@ -2906,7 +3004,6 @@
int arg4 ;
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -2914,6 +3011,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNpointSet_annkFRSearch",args.length(),4,4,0)) {
SWIG_fail;
@@ -3045,12 +3143,12 @@
static octave_value_list _wrap_ANNpointSet_theDim (const octave_value_list& args, int nargout) {
ANNpointSet *arg1 = (ANNpointSet *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNpointSet_theDim",args.length(),1,1,0)) {
SWIG_fail;
@@ -3076,12 +3174,12 @@
static octave_value_list _wrap_ANNpointSet_nPoints (const octave_value_list& args, int nargout) {
ANNpointSet *arg1 = (ANNpointSet *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNpointSet_nPoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -3107,12 +3205,12 @@
static octave_value_list _wrap_ANNpointSet_thePoints (const octave_value_list& args, int nargout) {
ANNpointSet *arg1 = (ANNpointSet *) 0 ;
- ANNpointArray result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpointArray result;
if (!SWIG_check_num_args("ANNpointSet_thePoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -3153,10 +3251,10 @@
int arg2 ;
int arg3 ;
bool arg4 ;
- ANNbruteForce *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbruteForce *result = 0 ;
if (!SWIG_check_num_args("new_ANNbruteForce",args.length(),1,1,0)) {
SWIG_fail;
@@ -3192,7 +3290,6 @@
ANNpointArray arg1 = (ANNpointArray) 0 ;
int arg2 ;
int arg3 ;
- ANNbruteForce *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
@@ -3202,6 +3299,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbruteForce *result = 0 ;
if (!SWIG_check_num_args("new_ANNbruteForce",args.length(),3,3,0)) {
SWIG_fail;
@@ -3304,8 +3402,7 @@
arg1 = (ANNbruteForce *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -3517,7 +3614,6 @@
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
double arg7 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -3527,6 +3623,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNbruteForce_annkFRSearch",args.length(),5,5,0)) {
SWIG_fail;
@@ -3594,7 +3691,6 @@
int arg4 ;
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -3602,6 +3698,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNbruteForce_annkFRSearch",args.length(),4,4,0)) {
SWIG_fail;
@@ -3733,12 +3830,12 @@
static octave_value_list _wrap_ANNbruteForce_theDim (const octave_value_list& args, int nargout) {
ANNbruteForce *arg1 = (ANNbruteForce *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNbruteForce_theDim",args.length(),1,1,0)) {
SWIG_fail;
@@ -3764,12 +3861,12 @@
static octave_value_list _wrap_ANNbruteForce_nPoints (const octave_value_list& args, int nargout) {
ANNbruteForce *arg1 = (ANNbruteForce *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNbruteForce_nPoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -3795,12 +3892,12 @@
static octave_value_list _wrap_ANNbruteForce_thePoints (const octave_value_list& args, int nargout) {
ANNbruteForce *arg1 = (ANNbruteForce *) 0 ;
- ANNpointArray result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpointArray result;
if (!SWIG_check_num_args("ANNbruteForce_thePoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -3870,7 +3967,6 @@
int arg1 ;
int arg2 ;
int arg3 ;
- ANNkd_tree *result = 0 ;
int val1 ;
int ecode1 = 0 ;
int val2 ;
@@ -3880,6 +3976,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -3916,7 +4013,6 @@
static octave_value_list _wrap_new_ANNkd_tree__SWIG_1 (const octave_value_list& args, int nargout) {
int arg1 ;
int arg2 ;
- ANNkd_tree *result = 0 ;
int val1 ;
int ecode1 = 0 ;
int val2 ;
@@ -3924,6 +4020,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),2,2,0)) {
SWIG_fail;
@@ -3954,12 +4051,12 @@
static octave_value_list _wrap_new_ANNkd_tree__SWIG_2 (const octave_value_list& args, int nargout) {
int arg1 ;
- ANNkd_tree *result = 0 ;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),1,1,0)) {
SWIG_fail;
@@ -3984,10 +4081,10 @@
static octave_value_list _wrap_new_ANNkd_tree__SWIG_3 (const octave_value_list& args, int nargout) {
- ANNkd_tree *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),0,0,0)) {
SWIG_fail;
@@ -4013,7 +4110,6 @@
bool arg4 ;
int arg5 ;
ANNsplitRule arg6 ;
- ANNkd_tree *result = 0 ;
int val5 ;
int ecode5 = 0 ;
int val6 ;
@@ -4021,6 +4117,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -4068,12 +4165,12 @@
int arg3 ;
bool arg4 ;
int arg5 ;
- ANNkd_tree *result = 0 ;
int val5 ;
int ecode5 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),2,2,0)) {
SWIG_fail;
@@ -4115,10 +4212,10 @@
int arg2 ;
int arg3 ;
bool arg4 ;
- ANNkd_tree *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),1,1,0)) {
SWIG_fail;
@@ -4154,7 +4251,6 @@
ANNpointArray arg1 = (ANNpointArray) 0 ;
int arg2 ;
int arg3 ;
- ANNkd_tree *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
@@ -4164,6 +4260,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -4199,12 +4296,12 @@
static octave_value_list _wrap_new_ANNkd_tree__SWIG_8 (const octave_value_list& args, int nargout) {
std::istream *arg1 = 0 ;
- ANNkd_tree *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNkd_tree",args.length(),1,1,0)) {
SWIG_fail;
@@ -4396,8 +4493,7 @@
arg1 = (ANNkd_tree *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -4801,7 +4897,6 @@
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
double arg7 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -4811,6 +4906,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkd_tree_annkFRSearch",args.length(),5,5,0)) {
SWIG_fail;
@@ -4878,7 +4974,6 @@
int arg4 ;
ANNidxArray arg5 = (ANNidxArray) 0 ;
ANNdistArray arg6 = (ANNdistArray) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
double val3 ;
@@ -4886,6 +4981,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkd_tree_annkFRSearch",args.length(),4,4,0)) {
SWIG_fail;
@@ -5017,12 +5113,12 @@
static octave_value_list _wrap_ANNkd_tree_theDim (const octave_value_list& args, int nargout) {
ANNkd_tree *arg1 = (ANNkd_tree *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkd_tree_theDim",args.length(),1,1,0)) {
SWIG_fail;
@@ -5048,12 +5144,12 @@
static octave_value_list _wrap_ANNkd_tree_nPoints (const octave_value_list& args, int nargout) {
ANNkd_tree *arg1 = (ANNkd_tree *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkd_tree_nPoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -5079,12 +5175,12 @@
static octave_value_list _wrap_ANNkd_tree_thePoints (const octave_value_list& args, int nargout) {
ANNkd_tree *arg1 = (ANNkd_tree *) 0 ;
- ANNpointArray result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpointArray result;
if (!SWIG_check_num_args("ANNkd_tree_thePoints",args.length(),1,1,0)) {
SWIG_fail;
@@ -5248,7 +5344,6 @@
int arg1 ;
int arg2 ;
int arg3 ;
- ANNbd_tree *result = 0 ;
int val1 ;
int ecode1 = 0 ;
int val2 ;
@@ -5258,6 +5353,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -5294,7 +5390,6 @@
static octave_value_list _wrap_new_ANNbd_tree__SWIG_1 (const octave_value_list& args, int nargout) {
int arg1 ;
int arg2 ;
- ANNbd_tree *result = 0 ;
int val1 ;
int ecode1 = 0 ;
int val2 ;
@@ -5302,6 +5397,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),2,2,0)) {
SWIG_fail;
@@ -5338,7 +5434,6 @@
int arg5 ;
ANNsplitRule arg6 ;
ANNshrinkRule arg7 ;
- ANNbd_tree *result = 0 ;
int val5 ;
int ecode5 = 0 ;
int val6 ;
@@ -5348,6 +5443,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),4,4,0)) {
SWIG_fail;
@@ -5401,7 +5497,6 @@
bool arg4 ;
int arg5 ;
ANNsplitRule arg6 ;
- ANNbd_tree *result = 0 ;
int val5 ;
int ecode5 = 0 ;
int val6 ;
@@ -5409,6 +5504,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -5456,12 +5552,12 @@
int arg3 ;
bool arg4 ;
int arg5 ;
- ANNbd_tree *result = 0 ;
int val5 ;
int ecode5 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),2,2,0)) {
SWIG_fail;
@@ -5503,10 +5599,10 @@
int arg2 ;
int arg3 ;
bool arg4 ;
- ANNbd_tree *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),1,1,0)) {
SWIG_fail;
@@ -5542,7 +5638,6 @@
ANNpointArray arg1 = (ANNpointArray) 0 ;
int arg2 ;
int arg3 ;
- ANNbd_tree *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
@@ -5552,6 +5647,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),3,3,0)) {
SWIG_fail;
@@ -5587,12 +5683,12 @@
static octave_value_list _wrap_new_ANNbd_tree__SWIG_7 (const octave_value_list& args, int nargout) {
std::istream *arg1 = 0 ;
- ANNbd_tree *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbd_tree *result = 0 ;
if (!SWIG_check_num_args("new_ANNbd_tree",args.length(),1,1,0)) {
SWIG_fail;
@@ -5798,8 +5894,7 @@
arg1 = (ANNbd_tree *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -5901,7 +5996,6 @@
}
}
if (arg1) (arg1)->msg = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -5911,12 +6005,12 @@
static octave_value_list _wrap_ANN_exception_msg_get (const octave_value_list& args, int nargout) {
ANN_exception *arg1 = (ANN_exception *) 0 ;
- std::string result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ std::string result;
if (!SWIG_check_num_args("ANN_exception_msg_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -5936,12 +6030,12 @@
static octave_value_list _wrap_new_ANN_exception (const octave_value_list& args, int nargout) {
std::string *arg1 = 0 ;
- ANN_exception *result = 0 ;
void *argp1 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANN_exception *result = 0 ;
if (!SWIG_check_num_args("new_ANN_exception",args.length(),1,1,0)) {
SWIG_fail;
@@ -5986,8 +6080,7 @@
arg1 = (ANN_exception *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -6032,7 +6125,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->dim = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6042,12 +6134,12 @@
static octave_value_list _wrap_ANNkdStats_dim_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_dim_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6090,7 +6182,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->n_pts = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6100,12 +6191,12 @@
static octave_value_list _wrap_ANNkdStats_n_pts_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_n_pts_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6148,7 +6239,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->bkt_size = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6158,12 +6248,12 @@
static octave_value_list _wrap_ANNkdStats_bkt_size_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_bkt_size_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6206,7 +6296,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->n_lf = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6216,12 +6305,12 @@
static octave_value_list _wrap_ANNkdStats_n_lf_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_n_lf_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6264,7 +6353,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->n_tl = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6274,12 +6362,12 @@
static octave_value_list _wrap_ANNkdStats_n_tl_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_n_tl_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6322,7 +6410,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->n_spl = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6332,12 +6419,12 @@
static octave_value_list _wrap_ANNkdStats_n_spl_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_n_spl_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6380,7 +6467,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->n_shr = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6390,12 +6476,12 @@
static octave_value_list _wrap_ANNkdStats_n_shr_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_n_shr_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6438,7 +6524,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->depth = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6448,12 +6533,12 @@
static octave_value_list _wrap_ANNkdStats_depth_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNkdStats_depth_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6496,7 +6581,6 @@
}
arg2 = (float)(val2);
if (arg1) (arg1)->sum_ar = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6506,12 +6590,12 @@
static octave_value_list _wrap_ANNkdStats_sum_ar_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- float result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ float result;
if (!SWIG_check_num_args("ANNkdStats_sum_ar_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6554,7 +6638,6 @@
}
arg2 = (float)(val2);
if (arg1) (arg1)->avg_ar = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -6564,12 +6647,12 @@
static octave_value_list _wrap_ANNkdStats_avg_ar_get (const octave_value_list& args, int nargout) {
ANNkdStats *arg1 = (ANNkdStats *) 0 ;
- float result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ float result;
if (!SWIG_check_num_args("ANNkdStats_avg_ar_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -6840,10 +6923,10 @@
static octave_value_list _wrap_new_ANNkdStats (const octave_value_list& args, int nargout) {
- ANNkdStats *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNkdStats *result = 0 ;
if (!SWIG_check_num_args("new_ANNkdStats",args.length(),0,0,0)) {
SWIG_fail;
@@ -6916,8 +6999,7 @@
arg1 = (ANNkdStats *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -6979,10 +7061,10 @@
static octave_value_list _wrap_new_ANNsampStat (const octave_value_list& args, int nargout) {
- ANNsampStat *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNsampStat *result = 0 ;
if (!SWIG_check_num_args("new_ANNsampStat",args.length(),0,0,0)) {
SWIG_fail;
@@ -7003,12 +7085,12 @@
static octave_value_list _wrap_ANNsampStat_samples (const octave_value_list& args, int nargout) {
ANNsampStat *arg1 = (ANNsampStat *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNsampStat_samples",args.length(),1,1,0)) {
SWIG_fail;
@@ -7034,12 +7116,12 @@
static octave_value_list _wrap_ANNsampStat_mean (const octave_value_list& args, int nargout) {
ANNsampStat *arg1 = (ANNsampStat *) 0 ;
- double result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ double result;
if (!SWIG_check_num_args("ANNsampStat_mean",args.length(),1,1,0)) {
SWIG_fail;
@@ -7065,12 +7147,12 @@
static octave_value_list _wrap_ANNsampStat_stdDev (const octave_value_list& args, int nargout) {
ANNsampStat *arg1 = (ANNsampStat *) 0 ;
- double result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ double result;
if (!SWIG_check_num_args("ANNsampStat_stdDev",args.length(),1,1,0)) {
SWIG_fail;
@@ -7096,12 +7178,12 @@
static octave_value_list _wrap_ANNsampStat_min (const octave_value_list& args, int nargout) {
ANNsampStat *arg1 = (ANNsampStat *) 0 ;
- double result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ double result;
if (!SWIG_check_num_args("ANNsampStat_min",args.length(),1,1,0)) {
SWIG_fail;
@@ -7127,12 +7209,12 @@
static octave_value_list _wrap_ANNsampStat_max (const octave_value_list& args, int nargout) {
ANNsampStat *arg1 = (ANNsampStat *) 0 ;
- double result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ double result;
if (!SWIG_check_num_args("ANNsampStat_max",args.length(),1,1,0)) {
SWIG_fail;
@@ -7174,8 +7256,7 @@
arg1 = (ANNsampStat *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -7884,7 +7965,6 @@
arg2[j]=p(j);
}
if (arg1) (arg1)->lo = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
annDeallocPt(arg2);
@@ -7895,12 +7975,12 @@
static octave_value_list _wrap_ANNorthRect_lo_get (const octave_value_list& args, int nargout) {
ANNorthRect *arg1 = (ANNorthRect *) 0 ;
- ANNpoint result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpoint result;
if (!SWIG_check_num_args("ANNorthRect_lo_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -7945,7 +8025,6 @@
arg2[j]=p(j);
}
if (arg1) (arg1)->hi = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
annDeallocPt(arg2);
@@ -7956,12 +8035,12 @@
static octave_value_list _wrap_ANNorthRect_hi_get (const octave_value_list& args, int nargout) {
ANNorthRect *arg1 = (ANNorthRect *) 0 ;
- ANNpoint result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNpoint result;
if (!SWIG_check_num_args("ANNorthRect_hi_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -7983,7 +8062,6 @@
int arg1 ;
ANNcoord arg2 ;
ANNcoord arg3 ;
- ANNorthRect *result = 0 ;
int val1 ;
int ecode1 = 0 ;
double val2 ;
@@ -7993,6 +8071,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthRect *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthRect",args.length(),3,3,0)) {
SWIG_fail;
@@ -8029,7 +8108,6 @@
static octave_value_list _wrap_new_ANNorthRect__SWIG_1 (const octave_value_list& args, int nargout) {
int arg1 ;
ANNcoord arg2 ;
- ANNorthRect *result = 0 ;
int val1 ;
int ecode1 = 0 ;
double val2 ;
@@ -8037,6 +8115,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthRect *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthRect",args.length(),2,2,0)) {
SWIG_fail;
@@ -8067,12 +8146,12 @@
static octave_value_list _wrap_new_ANNorthRect__SWIG_2 (const octave_value_list& args, int nargout) {
int arg1 ;
- ANNorthRect *result = 0 ;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthRect *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthRect",args.length(),1,1,0)) {
SWIG_fail;
@@ -8099,7 +8178,6 @@
static octave_value_list _wrap_new_ANNorthRect__SWIG_3 (const octave_value_list& args, int nargout) {
int arg1 ;
ANNorthRect *arg2 = 0 ;
- ANNorthRect *result = 0 ;
int val1 ;
int ecode1 = 0 ;
void *argp2 ;
@@ -8107,6 +8185,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthRect *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthRect",args.length(),2,2,0)) {
SWIG_fail;
@@ -8142,12 +8221,12 @@
int arg1 ;
ANNpoint arg2 = (ANNpoint) 0 ;
ANNpoint arg3 = (ANNpoint) 0 ;
- ANNorthRect *result = 0 ;
int val1 ;
int ecode1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthRect *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthRect",args.length(),3,3,0)) {
SWIG_fail;
@@ -8304,8 +8383,7 @@
arg1 = (ANNorthRect *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -8321,7 +8399,6 @@
ANNorthRect *arg1 = (ANNorthRect *) 0 ;
int arg2 ;
ANNpoint arg3 = (ANNpoint) 0 ;
- ANNbool result;
void *argp1 = 0 ;
int res1 = 0 ;
int val2 ;
@@ -8329,6 +8406,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbool result;
if (!SWIG_check_num_args("ANNorthRect_inside",args.length(),3,3,0)) {
SWIG_fail;
@@ -8454,7 +8532,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->cd = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -8464,12 +8541,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_cd_get (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNorthHalfSpace_cd_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -8512,7 +8589,6 @@
}
arg2 = (ANNcoord)(val2);
if (arg1) (arg1)->cv = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -8522,12 +8598,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_cv_get (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
- ANNcoord result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNcoord result;
if (!SWIG_check_num_args("ANNorthHalfSpace_cv_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -8570,7 +8646,6 @@
}
arg2 = (int)(val2);
if (arg1) (arg1)->sd = arg2;
-
_outv = octave_value();
if (_outv.is_defined()) _outp = SWIG_Octave_AppendOutput(_outp, _outv);
fail:
@@ -8580,12 +8655,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_sd_get (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
- int result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ int result;
if (!SWIG_check_num_args("ANNorthHalfSpace_sd_get",args.length(),1,1,0)) {
SWIG_fail;
@@ -8604,10 +8679,10 @@
static octave_value_list _wrap_new_ANNorthHalfSpace__SWIG_0 (const octave_value_list& args, int nargout) {
- ANNorthHalfSpace *result = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthHalfSpace *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthHalfSpace",args.length(),0,0,0)) {
SWIG_fail;
@@ -8630,7 +8705,6 @@
int arg1 ;
ANNcoord arg2 ;
int arg3 ;
- ANNorthHalfSpace *result = 0 ;
int val1 ;
int ecode1 = 0 ;
double val2 ;
@@ -8640,6 +8714,7 @@
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNorthHalfSpace *result = 0 ;
if (!SWIG_check_num_args("new_ANNorthHalfSpace",args.length(),3,3,0)) {
SWIG_fail;
@@ -8713,12 +8788,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_in (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
ANNpoint arg2 = (ANNpoint) 0 ;
- ANNbool result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbool result;
if (!SWIG_check_num_args("ANNorthHalfSpace_in",args.length(),2,2,0)) {
SWIG_fail;
@@ -8755,12 +8830,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_out (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
ANNpoint arg2 = (ANNpoint) 0 ;
- ANNbool result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNbool result;
if (!SWIG_check_num_args("ANNorthHalfSpace_out",args.length(),2,2,0)) {
SWIG_fail;
@@ -8797,12 +8872,12 @@
static octave_value_list _wrap_ANNorthHalfSpace_dist (const octave_value_list& args, int nargout) {
ANNorthHalfSpace *arg1 = (ANNorthHalfSpace *) 0 ;
ANNpoint arg2 = (ANNpoint) 0 ;
- ANNdist result;
void *argp1 = 0 ;
int res1 = 0 ;
octave_value_list _out;
octave_value_list *_outp=&_out;
octave_value _outv;
+ ANNdist result;
if (!SWIG_check_num_args("ANNorthHalfSpace_dist",args.length(),2,2,0)) {
SWIG_fail;
@@ -8993,8 +9068,7 @@
arg1 = (ANNorthHalfSpace *)(argp1);
{
try {
- delete arg1;
- ;
+ delete arg1;;
} catch (ANN_exception& e) {
error("ANN fatal error: %s",e.msg.c_str());
}
@@ -9152,16 +9226,16 @@
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
-static void *_p_ANNbd_treeTo_p_ANNkd_tree(void *x, int *newmemory) {
+static void *_p_ANNbd_treeTo_p_ANNkd_tree(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ANNkd_tree *) ((ANNbd_tree *) x));
}
-static void *_p_ANNbruteForceTo_p_ANNpointSet(void *x, int *newmemory) {
+static void *_p_ANNbruteForceTo_p_ANNpointSet(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ANNpointSet *) ((ANNbruteForce *) x));
}
-static void *_p_ANNkd_treeTo_p_ANNpointSet(void *x, int *newmemory) {
+static void *_p_ANNkd_treeTo_p_ANNpointSet(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ANNpointSet *) ((ANNkd_tree *) x));
}
-static void *_p_ANNbd_treeTo_p_ANNpointSet(void *x, int *newmemory) {
+static void *_p_ANNbd_treeTo_p_ANNpointSet(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((ANNpointSet *) (ANNkd_tree *) ((ANNbd_tree *) x));
}
static swig_type_info _swigt__p_ANN_exception = {"_p_ANN_exception", "ANN_exception *", 0, 0, (void*)&_wrap_class_ANN_exception, 0};
Modified: trunk/octave-forge/main/database/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/database/DESCRIPTION 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/database/DESCRIPTION 2009-01-10 01:02:37 UTC (rev 5518)
@@ -1,6 +1,6 @@
Name: database
-Version: 1.0.2
-Date: 2008-08-23
+Version: 1.0.3
+Date: 2009-01-09
Author: Xavier Delacour
Maintainer: Xavier Delacour
Title: Bindings for postgres, mysql, sqlite, and standard ODBC
Modified: trunk/octave-forge/main/database/src/mysql.i
===================================================================
--- trunk/octave-forge/main/database/src/mysql.i 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/database/src/mysql.i 2009-01-10 01:02:37 UTC (rev 5518)
@@ -24,6 +24,9 @@
const char* __paren(int i) const {
return (*$self)[i];
}
+ const char* __paren__(int i) const {
+ return (*$self)[i];
+ }
}
// taken from mysql_com.h
Modified: trunk/octave-forge/main/database/src/mysql_filtered.h
===================================================================
--- trunk/octave-forge/main/database/src/mysql_filtered.h 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/database/src/mysql_filtered.h 2009-01-10 01:02:37 UTC (rev 5518)
@@ -561,6 +561,7 @@
char *to,const char *from,
unsigned long length);
void STDCALL mysql_debug(const char *debug);
+#ifndef SWIG
char * STDCALL mysql_odbc_escape_string(MYSQL *mysql,
char *to,
unsigned long to_length,
@@ -571,6 +572,7 @@
(*extend_buffer)
(void *, char *to,
unsigned long *length));
+#endif // SWIG
void STDCALL myodbc_remove_escape(MYSQL *mysql,char *name);
unsigned int STDCALL mysql_thread_safe(void);
my_bool STDCALL mysql_embedded(void);
Modified: trunk/octave-forge/main/database/src/mysql_wrap.cpp
===================================================================
--- trunk/octave-forge/main/database/src/mysql_wrap.cpp 2009-01-09 14:17:46 UTC (rev 5517)
+++ trunk/octave-forge/main/database/src/mysql_wrap.cpp 2009-01-10 01:02:37 UTC (rev 5518)
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.35
+ * Version 1.3.37
*
* This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make
@@ -8,22 +8,27 @@
* interface file instead.
* ----------------------------------------------------------------------------- */
+#define SWIGOCTAVE
#define SWIG_name_d "mysql"
#define SWIG_name mysql
+
#ifdef __cplusplus
+/* SwigValueWrapper is described in swig.swg */
template<typename T> class SwigValueWrapper {
- T *tt;
+ struct SwigMovePointer {
+ T *ptr;
+ SwigMovePointer(T *p) : ptr(p) { }
+ ~SwigMovePointer() { delete ptr; }
+ SwigMovePointer& operator=(SwigMovePointer& rhs) { T* oldptr = ptr; ptr = 0; delete oldptr; ptr = rhs.ptr; rhs.ptr = 0; return *this; }
+ } pointer;
+ SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+ SwigValueWrapper(const SwigValueWrapper<T>& rhs);
public:
- SwigValueWrapper() : tt(0) { }
- SwigValueWrapper(const SwigValueWrapper<T>& rhs) : tt(new T(*rhs.tt)) { }
- SwigValueWrapper(const T& t) : tt(new T(t)) { }
- ~SwigValueWrapper() { delete tt; }
- SwigValueWrapper& operator=(const T& t) { delete tt; tt = new T(t); return *this; }
- operator T&() const { return *tt; }
- T *operator&() { return tt; }
-private:
- SwigValueWrapper& operator=(const SwigValueWrapper<T>& rhs);
+ SwigValueWrapper() : pointer(0) { }
+ SwigValueWrapper& operator=(const T& t) { SwigMovePointer tmp(new T(t)); pointer = tmp; return *this; }
+ operator T&() const { return *pointer.ptr; }
+ T *operator&() { return pointer.ptr; }
};
template <typename T> T SwigValueInit() {
@@ -73,6 +78,12 @@
# endif
#endif
+#ifndef SWIG_MSC_UNSUPPRESS_4505
+# if defined(_MSC_VER)
+# pragma warning(disable : 4505) /* unreferenced local function has been removed */
+# endif
+#endif
+
#ifndef SWIGUNUSEDPARM
# ifdef __cplusplus
# define SWIGUNUSEDPARM(p)
@@ -139,11 +150,12 @@
#include <octave/parse.h>
#include <octave/ov-fcn-handle.h>
#include <octave/Cell.h>
+#include <octave/oct-map.h>
/* -----------------------------------------------------------------------------
* swigrun.swg
*
- * This file contains generic CAPI SWIG runtime support for pointer
+ * This file contains generic C API SWIG runtime support for pointer
* type checking.
* ----------------------------------------------------------------------------- */
@@ -162,11 +174,11 @@
/*
You can use the SWIGRUNTIME and SWIGRUNTIMEINLINE macros for
- creating a static or dynamic library from the swig runtime code.
- In 99.9% of the cases, swig just needs to declare them as 'static'.
+ creating a static or dynamic library from the SWIG runtime code.
+ In 99.9% of the cases, SWIG just needs to declare them as 'static'.
- But only do this if is strictly necessary, ie, if you have problems
- with your compiler or so.
+ But only do this if strictly necessary, ie, if you have problems
+ with your compiler or suchlike.
*/
#ifndef SWIGRUNTIME
@@ -193,14 +205,14 @@
/*
Flags/methods for returning states.
- The swig conversion methods, as ConvertPtr, return and integer
+ The SWIG conversion methods, as ConvertPtr, return and integer
that tells if the conversion was successful or not. And if not,
an error code can be returned (see swigerrors.swg for the codes).
Use the following macros/flags to set or process the returning
states.
- In old swig versions, you usually write code as:
+ In old versions of SWIG, code such as the following was usually written:
if (SWIG_ConvertPtr(obj,vptr,ty.flags) != -1) {
// success code
@@ -208,7 +220,7 @@
//fail code
}
- Now you can be more explicit as:
+ Now you can be more explicit:
int res = SWIG_ConvertPtr(obj,vptr,ty.flags);
if (SWIG_IsOK(res)) {
@@ -217,7 +229,7 @@
// fail code
}
- that seems to be the same, but now you can also do
+ which is the same really, but now you can also do
Type *ptr;
int res = SWIG_ConvertPtr(obj,(void **)(&ptr),ty.flags);
@@ -235,7 +247,7 @@
I.e., now SWIG_ConvertPtr can return new objects and you can
identify the case and take care of the deallocation. Of course that
- requires also to SWIG_ConvertPtr to return new result values, as
+ also requires SWIG_ConvertPtr to return new result values, such as
int SWIG_ConvertPtr(obj, ptr,...) {
if (<obj is ok>) {
@@ -253,7 +265,7 @@
Of course, returning the plain '0(success)/-1(fail)' still works, but you can be
more explicit by returning SWIG_BADOBJ, SWIG_ERROR or any of the
- swig errors code.
+ SWIG errors code.
Finally, if the SWIG_CASTRANK_MODE is enabled, the result code
allows to return the 'cast rank', for example, if you have this
@@ -267,9 +279,8 @@
fooi(1) // cast rank '0'
just use the SWIG_AddCast()/SWIG_CheckState()
+*/
-
- */
#define SWIG_OK (0)
#define SWIG_ERROR (-1)
#define SWIG_IsOK(r) (r >= 0)
@@ -294,7 +305,6 @@
#define SWIG_DelTmpMask(r) (SWIG_IsOK(r) ? (r & ~SWIG_TMPOBJMASK) : r)
#define SWIG_IsTmpObj(r) (SWIG_IsOK(r) && (r & SWIG_TMPOBJMASK))
-
/* Cast-Rank Mode */
#if defined(SWIG_CASTRANK_MODE)
# ifndef SWIG_TypeRank
@@ -317,8 +327,6 @@
#endif
-
-
#include <string.h>
#ifdef __cplus...
[truncated message content] |
