From 42eccf21004fad94132becf66a68aceed66d20f1 Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Mon, 27 Aug 2018 14:51:41 -0700
Subject: [PATCH] timfuz: quicker matrix loading

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 experiments/timfuz/timfuz.py      |  2 +-
 experiments/timfuz/timfuz_rref.py | 37 ++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/experiments/timfuz/timfuz.py b/experiments/timfuz/timfuz.py
index f0b4af9f..01727a4b 100644
--- a/experiments/timfuz/timfuz.py
+++ b/experiments/timfuz/timfuz.py
@@ -138,7 +138,7 @@ def simplify_rows(Ads, b_ub):
 
     sys.stdout.write('SimpR ')
     sys.stdout.flush()
-    progress = max(1, len(b_ub) / 100)
+    progress = int(max(1, len(b_ub) / 100))
     zero_ds = 0
     zero_es = 0
     for loopi, (b, rowd) in enumerate(zip(b_ub, Ads)):
diff --git a/experiments/timfuz/timfuz_rref.py b/experiments/timfuz/timfuz_rref.py
index 59016891..74771edd 100644
--- a/experiments/timfuz/timfuz_rref.py
+++ b/experiments/timfuz/timfuz_rref.py
@@ -27,6 +27,16 @@ def fracr(r):
 def fracm(m):
     return [fracr(r) for r in m]
 
+def fracr_quick(r):
+    return [Fraction(numerator=int(x), denominator=1) for x in r]
+
+# the way I'm doing thing they should all be even integers
+# hmm this was only slightly faster
+def fracm_quick(m):
+    t = type(m[0][0])
+    print('fracm_quick type: %s' % t)
+    return [fracr_quick(r) for r in m]
+
 class State(object):
     def __init__(self, Ads, drop_names=[]):
         self.Ads = Ads
@@ -57,10 +67,11 @@ class State(object):
         assert len(self.names) >= len(self.subs)
 
     @staticmethod
-    def load(fn_ins):
-        Ads, b = loadc_Ads_b(fn_ins, corner=None, ico=True)
-        print('Simplifying')
-        #Ads, b = simplify_rows(Ads, b)
+    def load(fn_ins, simplify=False, corner=None):
+        Ads, b = loadc_Ads_b(fn_ins, corner=corner, ico=True)
+        if simplify:
+            print('Simplifying corner %s' % (corner,))
+            Ads, b = simplify_rows(Ads, b)
         return State(Ads)
 
 def write_state(state, fout):
@@ -115,12 +126,14 @@ def state_rref(state, verbose=False):
     names, Anp = A_ds2np(state.Ads)
 
     print('np: %u rows x %u cols' % (len(Anp), len(Anp[0])))
-    print('Combining rows into matrix')
-    #mnp = Anp2matrix(Anp)
-    mnp = Anp
+    if 0:
+        print('Combining rows into matrix')
+        mnp = Anp2matrix(Anp)
+    else:
+        mnp = Anp
     print('Matrix: %u rows x %u cols' % (len(mnp), len(mnp[0])))
     print('Converting np to sympy matrix')
-    mfrac = fracm(mnp)
+    mfrac = fracm_quick(mnp)
     msym = sympy.Matrix(mfrac)
     # internal encoding has significnat performance implications
     #print(type(msym[3]))
@@ -181,10 +194,10 @@ def state_rref(state, verbose=False):
 
     return state
 
-def run(fout, fn_ins, verbose=0):
+def run(fout, fn_ins, simplify=False, corner=None, verbose=0):
     print('Loading data')
 
-    state = State.load(fn_ins)
+    state = State.load(fn_ins, simplify=simplify, corner=corner)
     state_rref(state, verbose=verbose)
     state.print_stats()
     if fout:
@@ -199,6 +212,8 @@ def main():
     )
 
     parser.add_argument('--verbose', action='store_true', help='')
+    parser.add_argument('--simplify', action='store_true', help='')
+    parser.add_argument('--corner', default="slow_max", help='')
     parser.add_argument('--speed-json', default='build_speed/speed.json',
         help='Provides speed index to name translation')
     parser.add_argument('--out', help='Output sub.json substitution result')
@@ -219,7 +234,7 @@ def main():
 
     try:
         run(fout=fout,
-            fn_ins=args.fns_in, verbose=args.verbose)
+            fn_ins=args.fns_in, simplify=args.simplify, corner=args.corner, verbose=args.verbose)
     finally:
         print('Exiting after %s' % bench)