switch back to AMD ordering (seems as if COLAMD is slower for big sys…

…tems)
AMICI-dev · Jul 26, 2016 · ecb4c4d · ecb4c4d
1 parent f1bb89b
commit ecb4c4d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/@amimodel/generateM.m b/@amimodel/generateM.m
@@ -125,8 +125,8 @@ function generateM(this, amimodelo2)
     '%%        1: Hermite (DEFAULT for problems without discontinuities)\n'...
     '%%        2: Polynomial (DEFAULT for problems with discontinuities)\n'...
     '%%    .ordering   ... online state reordering.\n'...
-    '%%        0: AMD reordering\n'...
-    '%%        1: COLAMD reordering (default)\n'...
+    '%%        0: AMD reordering (default)\n'...
+    '%%        1: COLAMD reordering\n'...
     '%%        2: natural reordering\n'...
     '%%\n'...
     '%% Outputs:\n'...

diff --git a/@amioption/amioption.m b/@amioption/amioption.m
@@ -43,7 +43,7 @@
         % number of reported events
         nmaxevent = 10;
         % reordering of states
-        ordering = 1;
+        ordering = 0;
         % steady state sensitivity flag
         ss = 0;
         % custom initial sensitivity

diff --git a/src/symbolic_functions.c b/src/symbolic_functions.c
@@ -45,6 +45,21 @@ double amilog(double x) {
     }
 }
 
+/**
+ * c implementation of matlab function dirac
+ *
+ * @param x argument
+ * @return if(x==0) then INF else 0
+ *
+ */
+double dirac(double x) {
+    if (x == 0) {
+        return(DBL_MAX);
+    } else {
+        return(0);
+    }
+}
+
 /**
  * c implementation of matlab function heaviside
  *
@@ -61,6 +76,7 @@ double heaviside(double x) {
 }
 
 
+
 /**
  *  c implementation of matlab function sign
  *