diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

finish and test support for dynamic arrays

Browse Source
This commit is contained in:
Denys Duchier
2011-08-09 16:30:59 +02:00
parent 31063fdc85
commit 76dd2511a8
5 changed files with 90 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/gecode/Makefile.in
View File

@@ -57,7 +57,7 @@ gecode_yap.o: \
gecode_yap_cc_forward_auto_generated.icc \
$(srcdir)/disjunctor.icc \
$(srcdir)/disjunctor.hh
$(CXX) -c -I. $(CXXFLAGS) $(DISJUNCTOR) -o $@ $<
$(CXX) -c $(CXXFLAGS) $(DISJUNCTOR) -o $@ $<
@DO_SECOND_LD@gecode_yap.@SO@: gecode_yap.o
@DO_SECOND_LD@ @SHLIB_LD@ -o gecode_yap.@SO@ gecode_yap.o $(LDFLAGS) -lgecodeint -lgecodeset -lgecodesearch @EXTRA_LIBS_FOR_DLLS@

70
library/gecode/gecode_yap.cc
View File

@@ -22,6 +22,45 @@ using namespace std;
using namespace generic_gecode;
using namespace Gecode;
extern "C"
{
#include "config.h"
}
namespace generic_gecode
{
#ifndef HAVE_DYNARRAY
#error hello
template <typename T> struct DynArray
{
T* _array;
DynArray(int n): _array(new T[n]) {}
~DynArray() { delete[] _array; }
T& operator[](int i) { return _array[i]; }
};
#define DYNARRAY(T,A,N) DynArray<T> A(N)
#else
#define DYNARRAY(T,A,N) T A[N]
#endif
#ifndef HAVE_DYNARRAY
struct SpecArray
{
int (*_array)[2];
SpecArray(int n): _array((int (*)[2]) new int[n*2]) {}
~SpecArray() { delete[] _array; }
int& operator()(int i,int j) { return _array[i][j]; }
};
#define SPECARRAY(A,N) SpecArray A(N)
#define SPECARRAYELEM(A,I,J) A(I,J)
#define SPECARRAYDEREF(A) A._array
#else
#define SPECARRAY(A,N) int A[N][2]
#define SPECARRAYELEM(A,I,J) A[I][J]
#define SPECARRAYDEREF(A) A
#endif
}
extern "C"
{
#include "SWI-Stream.h"
@@ -261,22 +300,6 @@ extern "C"
return n;
}
#ifndef HAVE_DYNARRAY
struct SpecArray
{
int* _array;
SpecArray(int n): _array(new int[n][2]) {}
~SpecArray() { delete[] _array; }
typedef int (*_specarray)[][2];
T& operator()(int i,int j) { return ((_specarray)_array)[i][j]; }
};
#define SPECARRAY(A,N) SpecArray A(N)
#define SPECARRAYELEM(A,I,J) A(I,J)
#else
#define SPECARRAY(A,N) int A[N][2]
#define SPECARRAYELEM(A,I,J) A[I][J]
#endif
static IntSet
gecode_IntSet_from_term(YAP_Term specs)
{
@@ -291,7 +314,7 @@ extern "C"
SPECARRAYELEM(r,i,1) = YAP_IntOfTerm(YAP_ArgOfTerm(2, head));
i += 1;
}
return IntSet(r, n);
return IntSet(SPECARRAYDEREF(r), n);
}
static int gecode_new_intvar_from_intset(void)
@@ -844,19 +867,6 @@ extern "C"
return YAP_Unify(result, YAP_MkIntTerm(x.glbMax()));
}
#ifndef HAVE_DYNARRAY
template <typename T> struct DynArray
{
T* _array;
DynArray(int n): _array(new T[n]) {}
~DynArray() { delete[] _array; }
T& operator[](int i) { return _array[i]; }
};
#define DYNARRAY(T,A,N) DynArray<T> A(N)
#else
#define DYNARRAY(T,A,N) T A[N]
#endif
static YAP_Functor gecode_COMMA2;
static int gecode_setvar_glb_ranges(void)