From c6a3043798538d6e19d56a20e91149144303c641 Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sun, 30 Apr 2017 10:11:58 -0400
Subject: [PATCH] Fix bug: scale rays only once

---
 infinity/library/src/infinity-2d.c | 5 +----
 multirow/include/multirow/params.h | 4 ++--
 multirow/src/cg.c                  | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/infinity/library/src/infinity-2d.c b/infinity/library/src/infinity-2d.c
index fff9315..3dc87f7 100644
--- a/infinity/library/src/infinity-2d.c
+++ b/infinity/library/src/infinity-2d.c
@@ -540,8 +540,8 @@ int INFINITY_2D_generate_lfree(const struct MultiRowModel *model,
 
     lfree->nrows = 2;
     lfree->rays.nrays = nrays;
-    memcpy(f, model->f, 2 * sizeof(double));
     memcpy(rays, model->rays.values, 2 * nrays * sizeof(double));
+    memcpy(f, model->f, 2 * sizeof(double));
     for (int i = 0; i < nrays; i++) beta[i] = GREEDY_BIG_E;
 
     scale = (double*) malloc(nrays * sizeof(double));
@@ -721,9 +721,6 @@ int INFINITY_2D_generate_lfree(const struct MultiRowModel *model,
         if(is_split) break;
     }
 
-    for(int i=0; i<nrays; i++)
-        beta[i] *= scale[i];
-
     CLEANUP:
     if(scale) free(scale);
     return rval;
diff --git a/multirow/include/multirow/params.h b/multirow/include/multirow/params.h
index 8ded0bc..55be1bb 100644
--- a/multirow/include/multirow/params.h
+++ b/multirow/include/multirow/params.h
@@ -31,7 +31,7 @@
  *      LOG_LEVEL_WARNING
  *      LOG_LEVEL_ERROR
  */
-#define LOG_LEVEL LOG_LEVEL_DEBUG
+#define LOG_LEVEL LOG_LEVEL_INFO
 
 /*
  * Maximum bounding-box size for naive algorithm
@@ -48,7 +48,7 @@
  */
 #define N_RAYS 100
 
-#define ONLY_CUT 242
+#define ONLY_CUT -1
 
 /*
  * Time limit for the computation (user time, in seconds).
diff --git a/multirow/src/cg.c b/multirow/src/cg.c
index 5eba504..16f9350 100644
--- a/multirow/src/cg.c
+++ b/multirow/src/cg.c
@@ -867,7 +867,6 @@ int CG_add_multirow_cuts(struct CG *cg,
 
             double initial_time = get_user_time();
 
-             SHOULD_DUMP_CUTS = 1;
             rval = generate(&tableau, &cut);
             if (rval == ERR_NO_CUT)
             {