do not define DEBUG_DELAUNAY 1 :)

xyzxqs · Oct 12, 2016 · b673a9f · b673a9f
1 parent 9f1e98a
commit b673a9f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 92 deletions.
diff --git a/xlowpoly/CMakeLists.txt b/xlowpoly/CMakeLists.txt
@@ -24,8 +24,7 @@ add_library( # Sets the name of the library.
              src/main/cpp/lowpoly.c
              src/main/cpp/dilution.c
              src/main/cpp/point.c
-             src/main/cpp/_log.c
-             src/main/cpp/dedup.c)
+             src/main/cpp/dedup.c )
 
 # Searches for a specified prebuilt library and stores the path as a
 # variable. Because system libraries are included in the search path by

diff --git a/xlowpoly/src/main/cpp/_log.c b/xlowpoly/src/main/cpp/_log.c
diff --git a/xlowpoly/src/main/cpp/_log.h b/xlowpoly/src/main/cpp/_log.h
@@ -21,16 +21,12 @@
 #ifndef XLOWPOLY_LOG_H
 #define XLOWPOLY_LOG_H
 
-#define PRINT_DEBUG_LOG
+#include <android/log.h>
 
-void _log_v(const char *tag, const char *fmt, ...);
-
-void _log_d(const char *tag, const char *fmt, ...);
-
-void _log_i(const char *tag, const char *fmt, ...);
-
-void _log_w(const char *tag, const char *fmt, ...);
-
-void _log_e(const char *tag, const char *fmt, ...);
+#define _log_i(tag, ...) __android_log_print(ANDROID_LOG_INFO, tag, __VA_ARGS__)
+#define _log_d(tag, ...) __android_log_print(ANDROID_LOG_DEBUG, tag, __VA_ARGS__)
+#define _log_e(tag, ...) __android_log_print(ANDROID_LOG_ERROR, tag, __VA_ARGS__)
+#define _log_w(tag, ...) __android_log_print(ANDROID_LOG_WARN, tag, __VA_ARGS__)
+#define _log_v(tag, ...) __android_log_print(ANDROID_LOG_VERBOSE, tag, __VA_ARGS__)
 
 #endif //XLOWPOLY_LOG_H
diff --git a/xlowpoly/src/main/cpp/delaunay.c b/xlowpoly/src/main/cpp/delaunay.c
@@ -27,7 +27,7 @@
 #include "_log.h"
 #include "point.h"
 
-
+//do not define DEBUG_DELAUNAY 1  :)
 #define DEBUG_DELAUNAY 0
 
 //Local Optimization Procedure
@@ -242,16 +242,17 @@ void trinet_point_add(const int target_point_index, const TriNet *triNet) {
 #endif
     for (AngNode *p = angs_head->next; p != NULL;) {
         triangle_remove(p->vertex, p->subtense, triNet);
-        int sub_index = p->subtense->nock_vertex;
+        int nock = p->subtense->nock_vertex;
+        int arrow = p->subtense->arrow_vertex;
         arcnode_add(arcs_head, p->subtense);
         Arc *head = (triNet->arcs_heads)[p->vertex];
         pnode_unique_add(points_head, p->vertex);
         for (Arc *pa = head->next; pa != NULL;) {
-            if (pa->arrow_vertex == p->subtense->arrow_vertex) {
+            if (pa->arrow_vertex == arrow) {
                 arcnode_add(arcs_head, pa);
                 pnode_unique_add(points_head, pa->arrow_vertex);
             }
-            if (pa->arrow_vertex == sub_index) {
+            if (pa->arrow_vertex == nock) {
                 arcnode_add(arcs_head, pa);
                 pnode_unique_add(points_head, pa->arrow_vertex);
             }