nicer formatting, removing some prints

cspollard · Jul 12, 2020 · 4b027f8 · 4b027f8
1 parent 811bb41
commit 4b027f8
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 19 deletions.
diff --git a/app/Main.hs b/app/Main.hs
@@ -76,19 +76,21 @@ main = do
       Right (dataH, model, modelparams)
         -> runModel hamiltonian nsamps outfile dataH model (const 0) modelparams
 
-  let uncerts = posteriorMatrices params covariances
+  return ()
 
-  withFile tablesfile WriteMode $ \h -> do
-      hPutStrLn h "absolute uncertainties:"
-      hPutStrLn h . latextable $ view _1 <$> uncerts
+  -- let uncerts = posteriorMatrices params covariances
 
-      hPutStrLn h ""
-      hPutStrLn h "relative uncertainties:"
-      hPutStrLn h . latextable $ view _2 <$> uncerts
+  -- withFile tablesfile WriteMode $ \h -> do
+  --     hPutStrLn h "absolute uncertainties:"
+  --     hPutStrLn h . latextable $ view _1 <$> uncerts
 
-      hPutStrLn h ""
-      hPutStrLn h "correlations:"
-      hPutStrLn h . latextable $ view _3 <$> uncerts
+  --     hPutStrLn h ""
+  --     hPutStrLn h "relative uncertainties:"
+  --     hPutStrLn h . latextable $ view _2 <$> uncerts
+
+  --     hPutStrLn h ""
+  --     hPutStrLn h "correlations:"
+  --     hPutStrLn h . latextable $ view _3 <$> uncerts
 
 
 

diff --git a/ext/plot.py b/ext/plot.py
@@ -129,7 +129,6 @@
     plt.close()
 
 
-
     if name.startswith("recobin"):
         recobinx.append(float(name[7:]))
         recobiny.append(best)

diff --git a/src/RunModel.hs b/src/RunModel.hs
@@ -53,6 +53,7 @@ toError = either error id
 
 type HMT = M.HashMap T.Text
 
+
 runModel
   :: (Maybe (Int, Double))
   -> Int
@@ -178,14 +179,14 @@ runModel hamParams nsamps outfile dataH model' logReg modelparams = do
   putStrLn "covariance matrix:"
   print . fst $ toMatrix cov
   putStrLn ""
-  putStr . T.unpack $ matToTable covlist
-  putStrLn ""
-  putStrLn "absolute uncertainties:"
-  putStr . T.unpack $ matToTable absuncerts
-  putStrLn ""
-  putStrLn "relative uncertainties:"
-  putStr . T.unpack $ matToTable reluncerts
-  putStrLn ""
+  -- putStr . T.unpack $ matToTable covlist
+  -- putStrLn ""
+  -- putStrLn "absolute uncertainties:"
+  -- putStr . T.unpack $ matToTable absuncerts
+  -- putStrLn ""
+  -- putStrLn "relative uncertainties:"
+  -- putStr . T.unpack $ matToTable reluncerts
+  -- putStrLn ""
   putStrLn "transformation matrix:"
   print . fst $ toMatrix t
 
@@ -373,10 +374,12 @@ posteriorMatrices params covariances =
 eitherA :: (a -> Bool) -> a -> Either a a
 eitherA f x = if f x then Left x else Right x
 
+
 collapseEither :: Either a a -> a
 collapseEither (Left x)  = x
 collapseEither (Right x) = x
 
+
 latextable :: PrintfArg a => M.HashMap (T.Text, T.Text) a -> String
 latextable m =
   let ks = M.keys m