merged

dc9db580 · Davis King · 658927b3 · c6df93f5 · dc9db580 · dc9db580
Commit dc9db580 authored Dec 28, 2012 by Davis King
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

assert.h dlib/assert.h +3 -1

svm_c_linear_dcd.cpp dlib/test/svm_c_linear_dcd.cpp +1 -1

No files found.
--- a/dlib/assert.h
+++ b/dlib/assert.h
@@ -56,7 +56,9 @@ namespace dlib

 #if !defined(DLIB_DISABLE_ASSERTS) && ( defined DEBUG || defined _DEBUG)
    // make sure ENABLE_ASSERTS is defined if we are indeed using them.
-    #define ENABLE_ASSERTS
+    #ifndef ENABLE_ASSERTS
+        #define ENABLE_ASSERTS
+    #endif
 #endif

 // -----------------------------

--- a/dlib/test/svm_c_linear_dcd.cpp
+++ b/dlib/test/svm_c_linear_dcd.cpp
@@ -314,7 +314,7 @@ namespace
                rs.add(labels[k]*df(samples[k]));
            }
        }
-        DLIB_TEST_MSG(std::abs(rs.min()-1) < 1e-7, std::abs(rs.min()-1));
+        DLIB_TEST_MSG(std::abs(rs.min()-1) < 1e-6, std::abs(rs.min()-1));
    }

 // ----------------------------------------------------------------------------------------