Merge pull request #7391 from Faholan/delete-lut

Delete LUT

Author: maliberty

src/stt/include/stt/flute.h

@@ -4,6 +4,7 @@
 #include <vector>
 
 #include "SteinerTreeBuilder.h"
+#include "boost/multi_array.hpp"
 
 #pragma once
 
@@ -32,7 +33,7 @@ class Flute
   struct csoln;
 
  private:
-  using LUT_TYPE = struct csoln***;
+  using LUT_TYPE = boost::multi_array<std::shared_ptr<struct csoln[]>, 2>*;
   using NUMSOLN_TYPE = int**;
 
  public:

src/stt/src/flt/flute.cpp

@@ -74,7 +74,6 @@ static void readLUTfiles(LUT_TYPE LUT, NUMSOLN_TYPE numsoln)
 {
   unsigned char charnum[256], line[32], *linep, c;
   FILE *fpwv, *fprt;
-  struct csoln* p;
   int d, i, j, k, kk, ns, nn;
 
   for (i = 0; i <= 255; i++) {
@@ -114,12 +113,11 @@ static void readLUTfiles(LUT_TYPE LUT, NUMSOLN_TYPE numsoln)
         fscanf(fpwv, "%d", &kk);
         fgetc(fpwv);  // '/n'
         numsoln[d][k] = numsoln[d][kk];
-        LUT[d][k] = LUT[d][kk];
+        (*LUT)[d][k] = (*LUT)[d][kk];
       } else {
         fgetc(fpwv);  // '\n'
         numsoln[d][k] = ns;
-        p = (struct csoln*) malloc(ns * sizeof(struct csoln));
-        LUT[d][k] = p;
+        auto p = std::make_shared<struct csoln[]>(ns);
         for (i = 1; i <= ns; i++) {
           linep = (unsigned char*) fgets((char*) line, 32, fpwv);
           p->parent = charnum[*(linep++)];
@@ -147,6 +145,7 @@ static void readLUTfiles(LUT_TYPE LUT, NUMSOLN_TYPE numsoln)
 #endif
           p++;
         }
+        (*LUT)[d][k] = std::move(p);
       }
     }
   }
@@ -189,15 +188,16 @@ void Flute::readLUT()
   makeLUT(LUT_, numsoln_);
   initLUT(FLUTE_D, LUT_, numsoln_);
   checkLUT(LUT, numsoln, LUT_, numsoln_);
+  deleteLUT(LUT_, numsoln_);
 #endif
 }
 
 void Flute::makeLUT(LUT_TYPE& LUT, NUMSOLN_TYPE& numsoln)
 {
-  LUT = new struct csoln**[FLUTE_D + 1];
+  LUT = new boost::multi_array<std::shared_ptr<struct csoln[]>, 2>(
+      boost::extents[FLUTE_D + 1][MGROUP]);
   numsoln = new int*[FLUTE_D + 1];
   for (int d = 4; d <= FLUTE_D; d++) {
-    LUT[d] = new struct csoln*[MGROUP];
     numsoln[d] = new int[MGROUP];
   }
 }
@@ -210,13 +210,11 @@ void Flute::deleteLUT()
 void Flute::deleteLUT(LUT_TYPE& LUT, NUMSOLN_TYPE& numsoln)
 {
   if (LUT) {
+    delete LUT;
     for (int d = 4; d <= FLUTE_D; d++) {
-      delete[] LUT[d];
       delete[] numsoln[d];
     }
     delete[] numsoln;
-    delete[] LUT;
-    LUT = nullptr;
   }
 }
 
@@ -277,12 +275,12 @@ void Flute::initLUT(int to_d, LUT_TYPE LUT, NUMSOLN_TYPE numsoln)
         int kk;
         pwv = readDecimalInt(pwv, kk) + 1;
         numsoln[d][k] = numsoln[d][kk];
-        LUT[d][k] = LUT[d][kk];
+        (*LUT)[d][k] = (*LUT)[d][kk];
       } else {
         pwv++;  // '\n'
         numsoln[d][k] = ns;
         struct csoln* p = new struct csoln[ns];
-        LUT[d][k] = p;
+        (*LUT)[d][k] = std::shared_ptr<struct csoln[]>(p);
         for (int i = 1; i <= ns; i++) {
           p->parent = charNum(*pwv++);
 
@@ -348,8 +346,8 @@ static void checkLUT(LUT_TYPE LUT1,
       int ns2 = numsoln2[d][k];
       if (ns1 != ns2)
         printf("numsoln[%d][%d] mismatch\n", d, k);
-      struct csoln* soln1 = LUT1[d][k];
-      struct csoln* soln2 = LUT2[d][k];
+      struct csoln* soln1 = LUT1[d][k].get();
+      struct csoln* soln2 = LUT2[d][k].get();
       if (soln1->parent != soln2->parent)
         printf("LUT[%d][%d]->parent mismatch\n", d, k);
       for (int j = 0; soln1->seg[j] != 0; j++) {
@@ -573,7 +571,7 @@ int Flute::flutes_wl_LD(int d,
     }
 
     minl = l[0] = xs[d - 1] - xs[0] + ys[d - 1] - ys[0];
-    rlist = LUT[d][k];
+    rlist = (*LUT)[d][k].get();
     for (i = 0; rlist->seg[i] > 0; i++) {
       minl += dd[rlist->seg[i]];
     }
@@ -1135,7 +1133,7 @@ Tree Flute::flutes_LD(int d,
     }
 
     minl = l[0] = xs[d - 1] - xs[0] + ys[d - 1] - ys[0];
-    rlist = LUT[d][k];
+    rlist = (*LUT)[d][k].get();
     for (i = 0; rlist->seg[i] > 0; i++) {
       minl += dd[rlist->seg[i]];
     }