Missing files in last commit.

Author: Samana

include/2darray.h

@@ -66,6 +66,9 @@ namespace alg
 inline T& operator() (int row, int col) { return this->m_data[row*NC + col]; }
 const inline T& operator() (int row, int col) const { return this->m_data[row*NC + col]; }
 
+inline T* operator[] (int row) { return &(m_data[row * NC]); }
+inline const T* operator[] (int row) const { return &(m_data[row * NC]); }
+
 /**
  * clear the array by a given value
  */

include/double_linked_list.h

@@ -197,8 +197,14 @@ static inline void list_splice_init(struct list_head *list,
  * @type:	the type of the struct this is embedded in.
  * @member:	the name of the list_struct within the struct.
  */
+#ifndef _MSC_VER
 #define list_entry(ptr, type, member) \
 (reinterpret_cast<type *>((char *)(ptr)-(char *)(&(reinterpret_cast<type *>(1)->member))+1))
+#else
+#define list_entry(ptr, ptrtype, member) \
+(reinterpret_cast<ptrtype>((char *)(ptr)-(char *)(&(reinterpret_cast<ptrtype>(1)->member))+1))
+#endif
+
 
 /**
  * list_for_each	-	iterate over a list
@@ -233,23 +239,44 @@ static inline void list_splice_init(struct list_head *list,
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
+#ifndef _MSC_VER
 #define list_for_each_entry(pos, head, member)	\
 for (pos = list_entry((head)->next, typeof(*pos), member);	\
  &pos->member != (head);	\
  pos = list_entry(pos->member.next, typeof(*pos), member))
-
+#else
+#define list_for_each_entry(pos, head, member)	\
+for (pos = list_entry((head)->next, typeof(pos), member);	\
+ &pos->member != (head);	\
+ pos = list_entry(pos->member.next, typeof(pos), member))
+#endif
 /**
  * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @pos:	the type * to use as a loop counter.
  * @n:	another type * to use as temporary storage
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
+#ifndef _MSC_VER
 #define list_for_each_entry_safe(pos, n, head, member)	\
 for (pos = list_entry((head)->next, typeof(*pos), member),	\
 n = list_entry(pos->member.next, typeof(*pos), member);	\
  &pos->member != (head);	\
  pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
+#else
+
+template<class T>
+struct TypeofHelper
+{
+typedef T Type;
+};
+
+#define list_for_each_entry_safe(pos, n, head, member)	\
+for (pos = list_entry((head)->next, TypeofHelper<typeof(pos)>::Type, member),	\
+n = list_entry(pos->member.next, TypeofHelper<typeof(pos)>::Type, member);	\
+ &(pos->member) != (head);	\
+ pos = n, n = list_entry(n->member.next, TypeofHelper<typeof(n)>::Type, member))
+#endif
 
 #endif

include/hash_multi.h

@@ -43,6 +43,10 @@ namespace alg
 return hash;
 }
 
+#ifdef _MSC_VER
+#define log2(x) (log(x) / log(2))
+#endif
+
 /**
  * init a hash table with size specified.
  */

include/word_seg.h

@@ -28,6 +28,10 @@
 #include "hash_table.h"
 #include "queue.h"
 
+#ifdef ALG_VLA_NOT_SUPPORTED
+#include "2darray.h"
+#endif//ALG_VLA_NOT_SUPPORTED
+
 namespace alg 
 {
 /**
@@ -199,14 +203,27 @@ namespace alg
 int pos = 0;
 int len = strlen(str);
 
+#ifdef ALG_VLA_NOT_SUPPORTED
+alg::Array2D<double> V(len, 4);
+uint32_t CH;
+
+// record the path
+alg::Array2D<> path(4, len+1);
+alg::Array2D<> newpath(4, len+1);
+
+path.clear(0);
+newpath.clear(0);
+#else
 double V[len][4];
 uint32_t CH;
 
 // record the path
 char path[4][len+1];
 char newpath[4][len+1];
+
 memset(path,0, sizeof(path));
 memset(newpath,0, sizeof(newpath));
+#endif
 
 // Initialize base case. the first observation.
 int i;

src/lcs_demo.cpp

@@ -15,7 +15,7 @@ do { \
 int main(void)
 {
 using namespace alg;
-int MAXN = 10;
+const int MAXN = 10;
 int X[MAXN];
 int Y[MAXN];
 

src/perfect_hash_demo.cpp

@@ -21,7 +21,7 @@
 int main(void)
 {
 using namespace alg;
-int MAXELEMENT = 100;
+const int MAXELEMENT = 100;
 
 uint32_t keys[MAXELEMENT];
 uint32_t values[MAXELEMENT];