WIP: fixing bounded to smp

sympiler · Jun 6, 2020 · 502e429 · 502e429
1 parent ee94042
commit 502e429
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/def.h b/def.h
@@ -15,6 +15,8 @@
 #include <cmath>
 
 
+
+ namespace format {
 #define NULLPNTR nullptr
 #define EMPTY -1
 #define FALSE false
@@ -30,7 +32,7 @@
 #else
 #define PRINT_CSV(x)
 #endif
- namespace format {
+
   double max_dbl = 1e20;
   double min_dbl = -max_dbl;
 

diff --git a/mp_format_converter.h b/mp_format_converter.h
@@ -402,6 +402,7 @@ namespace format {
    AT_eq->p = new int[num_eq + 1];
    AT_eq->i = new int[nnz_eq];
    AT_eq->x = new double[nnz_eq];
+
    assert(eq_idx.size() == num_eq);
    AT_eq->p[0] = 0;
    for (int ll = 0; ll < eq_idx.size(); ++ll) {
@@ -415,6 +416,8 @@ namespace format {
     }
    }
    smp_out->b_->row = num_eq;
+   AT_eq->nnz = nnz_eq;
+   assert(AT_eq->p[num_eq] == nnz_eq);
   smp_out->AT_ = AT_eq;
   smp_out->A_ = sym_lib::transpose_general(AT_eq);
   } else{

diff --git a/old/nasoq_driver.cpp b/old/nasoq_driver.cpp
@@ -56,7 +56,7 @@ void get_num_iter(double acc_thresh, int& inner_iter_ref,
 std::string strip_name(std::string name){
  name.find(".");
  auto p1 = name.rfind("/");
- auto p2 = name.rfind(".");
+ auto p2 = name.rfind("_");
  std::string slide = name.substr( p1 != std::string::npos ? p1+1 : 0,
    p2 != std::string::npos ? p2-p1-1 : std::string::npos);
  return slide;