merge with master branch

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/util/lp/sparse_vector.h

@@ -1,7 +1,22 @@
-/*
-  Copyright (c) 2017 Microsoft Corporation
-  Author: Lev Nachmanson
-*/
+/*++
+Copyright (c) 2017 Microsoft Corporation
+
+Module Name:
+
+    <name>
+
+Abstract:
+
+    <abstract>
+
+Author:
+
+    Lev Nachmanson (levnach)
+
+Revision History:
+
+
+--*/
 
 #pragma once
 #include "util/vector.h"
@@ -18,7 +33,7 @@ public:
     void push_back(unsigned index, T val) {
         m_data.push_back(std::make_pair(index, val));
     }
-#ifdef LEAN_DEBUG
+#ifdef Z3DEBUG
     T operator[] (unsigned i) const {
         for (auto &t : m_data) {
             if (t.first == i) return t.second;
@@ -27,7 +42,7 @@ public:
     }
 #endif
     void divide(T const & a) {
-        lp_assert(!lp_settings::is_eps_small_general(a, 1e-12));
+        SASSERT(!lp_settings::is_eps_small_general(a, 1e-12));
         for (auto & t : m_data) {  t.second /= a; }
     }