Merge pull request #325 from VibekeSkytt/feature3D

Feature3 d

Author: sbriseid

lrsplines3D/app/PointCloud2LRVol.C

@@ -4,6 +4,8 @@
 #include "GoTools/lrsplines3D/LRVolApprox.h"
 #include "GoTools/geometry/ObjectHeader.h"
 #include "GoTools/lrsplines3D/LRSpline3DBezierCoefs.h"
+#include <boost/timer.hpp>
+#include <time.h>
 
 using namespace std;
 using namespace Go;
@@ -33,6 +35,9 @@ void print_help_text()
   std::cout << "-tolfile: File specifying domains with specific tolerances, global tolerance apply outside domains. PointCloud2LR -tolfile for file format \n";
   std::cout << "-toldoc: Documentation on file format for tolerance domains. \n";
   std::cout << "-outfrac <percentage>: Local measure for when the fraction of points outside the tolerance should lead to volume splitting \n";
+  std::cout << "-feature <ncell1> <ncell2> <ncell3>: Specify 3D grid for feature output  \n";
+  std::cout << "-featurelevels <number of levels> <level 1> ... <level n> \n";
+  std::cout << "-featuredoc: Show feature documentation \n";
   std::cout << "-h or --help : Write this text\n";
 }
 
@@ -50,6 +55,38 @@ void print_tol_file_format()
   std::cout << "Ensure non-overlapping boxes. No test applied. \n";
 }
 
+void print_feature_info()
+{
+  std::cout << "-feature: <ncell1> <ncell2> <ncell3> : Command line parameter to write feature information to file according to given grid resolution \n \n";
+  std::cout << "Compute grid based feature information for the specified iteration level. \n";
+  std::cout << "As the computation can be time consuming (depending on the grid size), select the iteration levels carefully. \n";
+  std::cout << "The information is stored in files called cellinfox where the number x represent the iteration level." << std::endl;
+  std::cout << "The volume is parameterized on x, y and z and the volume value represents intensity/height" << std::endl;
+  std::cout << "If rgb is given the values will be scaled in the range [0,255] and stored as unsigned int, \n";
+  std::cout << "otherwise the values are represented as float in the range [0.0,10.0]" << std::endl;
+  std::cout << "The indicies represents the following information" << std::endl;
+  std::cout << "0: Average slope in cell (8 samples) \n";
+  std::cout << "1: Average value of surface in cell (8 samples)  \n";
+  std::cout << "2: Maximum difference of surface values in cell (8 samples)  \n";
+  std::cout << "3: Average distance between surface and points for each cell \n";
+  std::cout << "4: Maximum distance between surface and points in cell \n";
+  std::cout << "5: Average intensity/height value of points in cell \n";
+  std::cout << "6: Maximum difference of intensity values in cell \n";
+  std::cout << "7: Standard deviation of distances between point cloud and surface in cell \n";
+  std::cout << "8: Standard deviation of intensity values in cell \n";
+  std::cout << "9: Average distance between surface and points in cell divided by maximum distance \n";
+  std::cout << "10: Maximum difference between signed distances between points and surface in cell \n";
+  std::cout << "11: Average distance between points with higher intensity than the surface and surface in cell \n";
+  std::cout << "12: Average distance between points with lower intensity than the surface and surface in cell \n";
+  std::cout << "13: Number of point with lower intensity than the surface where the intensity difference is larger than threshold divided by the number of points in the cell \n";
+  std::cout << "14: Number of point with higher intensity than the surface where the intensity difference is larger than threshold divided by the number of points in the cell \n";
+  std::cout << "15: Number of surface elements in cell \n";
+  std::cout << "16: Average Lagrangian in cell (8 samples) " << std::endl;
+  std::cout << "17: Average absolute value of z-derivative in cell (8 samples) \n";
+  std::cout << "18: Maximum absolute value of z-derivative cell (8 samples) " << std::endl;
+}
+
+
 int fetchIntParameter(int argc, char *argv[], int ki, int& parameter, 
 		      int& nmb_par, vector<bool>& par_read)
 {
@@ -112,6 +149,8 @@ int main (int argc, char *argv[]) {
   double minsize = -1.0;
   double outfrac = 0.0;
   int ncell1=0, ncell2=0, ncell3=0;
+  bool features = false;
+  vector<int> feature_levels;
 
   int ki, kj;
   vector<bool> par_read(argc-1, false);
@@ -189,6 +228,44 @@ int main (int argc, char *argv[]) {
 	  outfrac = std::max(0.0, outfrac);
 	  outfrac /= 100.0;
 	}
+      else if (arg == "-feature")
+	{
+	  if (ki == argc-1)
+	    {
+	      std::cout << "ERROR: Missing input" << std::endl;
+	      print_help_text();
+	      return 1;
+	    }
+	  features = true;
+	  ncell1 = atoi(argv[ki+1]);
+	  ncell2 = atoi(argv[ki+2]);
+	  ncell3 = atoi(argv[ki+3]);
+	  par_read[ki-1] = par_read[ki] = par_read[ki+1] = par_read[ki+2] = true;
+	  nmb_par -= 4;
+	}
+     else if (arg == "-featurelevels")
+	{
+	  if (ki == argc-1)
+	    {
+	      std::cout << "ERROR: Missing input" << std::endl;
+	      print_help_text();
+	      return 1;
+	    }
+	  int fsize = atoi(argv[ki+1]);
+	  par_read[ki-1] = par_read[ki] = true;
+	  feature_levels.resize(fsize);
+	  for (int ka=0; ka<fsize; ++ka)
+	    {
+	      feature_levels[ka] = atoi(argv[ki+ka+2]);
+	      par_read[ki+ka+1] = true;
+	    }
+	  nmb_par -= (fsize+2);
+	}
+      else if (arg == "-featuredoc")
+	{
+	  print_feature_info();
+	  exit(0);
+	}
     }
 
   // Read remaining parameters
@@ -312,6 +389,15 @@ int main (int argc, char *argv[]) {
       std::cout << "Standard deviation: " << stdd << std::endl;
      }
 
+  time_t start = time(NULL);
+
+
+
+ boost::timer t;
+  double duration;
+
+  t.restart();
+
   std::cout << "Domain: [" << domain[0] << "," << domain[1] << "]x[" << domain[2];
   std::cout << "," << domain[3] << "]x[" << domain[4] << "," << domain[5] << "]" << std::endl;
   std::cout << "Range: [" << minval << "," << maxval << "]" << std::endl;
@@ -348,6 +434,13 @@ int main (int argc, char *argv[]) {
   else
     vol_approx.setVerbose(false);
 
+  // Feature output
+  if (features)
+    {
+      vol_approx.setFeatureOut(ncell1, ncell2, ncell3);
+      vol_approx.setFeatureLevel(feature_levels);
+    }
+
   double max, average, av_all;
   double maxout, avout;
   int num_out;
@@ -357,6 +450,14 @@ int main (int argc, char *argv[]) {
 
   vol_approx.fetchOutsideTolInfo(maxout, avout);
 
+  duration = t.elapsed();
+  std::cout << "Duration: " << duration << std::endl;
+  double min = floor(duration/60);
+  double sec = duration - 60*min;
+  std::cout << min << "m" << sec << "s" << std::endl;
+  time_t end = time(NULL);
+  std::cout<<"Execution Time: "<< (double)(end-start)<<" Seconds"<<std::endl;
+
   if (infofile)
     {
       std::ofstream infoout(infofile);   // Accuracy information output stream

lrsplines3D/include/GoTools/lrsplines3D/LRFeature3DUtils.h

@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 1998, 2000-2007, 2010, 2011, 2012, 2013 SINTEF ICT,
+ * Applied Mathematics, Norway.
+ *
+ * Contact information: E-mail: [email protected]                      
+ * SINTEF ICT, Department of Applied Mathematics,                         
+ * P.O. Box 124 Blindern,                                                 
+ * 0314 Oslo, Norway.                                                     
+ *
+ * This file is part of GoTools.
+ *
+ * GoTools is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version. 
+ *
+ * GoTools is distributed in the hope that it will be useful,        
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of         
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with GoTools. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * In accordance with Section 7(b) of the GNU Affero General Public
+ * License, a covered work must retain the producer line in every data
+ * file that is created or manipulated using GoTools.
+ *
+ * Other Usage
+ * You can be released from the requirements of the license by purchasing
+ * a commercial license. Buying such a license is mandatory as soon as you
+ * develop commercial activities involving the GoTools library without
+ * disclosing the source code of your own applications.
+ *
+ * This file may be used in accordance with the terms contained in a
+ * written agreement between you and SINTEF ICT. 
+ */
+
+
+#ifndef _LFEATURE3DUTILS_H
+#define _LRFEATUR3DEUTILS_H
+
+
+#include "GoTools/lrsplines3D/LRSplineVolume.h"
+#include <iostream>
+
+
+namespace Go
+{
+  namespace LRFeature3DUtils
+  {
+    // Write accuracy features to file
+    void writeCellInfo(const LRSplineVolume& vol, 
+		       double tol, int ncell1, int ncell2, int ncell3,
+		       std::ostream &out);
+    
+  };
+
+ }; // End namespace Go
+
+
+#endif // _LRFEATURE3DUTILS_H

lrsplines3D/include/GoTools/lrsplines3D/LRSpline3DEvalGrid.h

@@ -130,7 +130,9 @@ class LRSpline3DEvalGrid
 		double par = ll_x;
 		for (int ka=0; ka<order_U; ++ka, par+=du)
 		  {
-		    const bool on_end = (par == bfunctions[ki]->umax());
+		    if (ka == order_U-1)
+		      par = ur_x;
+		    const bool on_end = (par == orig_dom_[1]); //bfunctions[ki]->umax());
 		    val1[ki*order_U+ka] = uni1->evalBasisFunction(par, 0, on_end);
 		  }
 	      }
@@ -146,7 +148,9 @@ class LRSpline3DEvalGrid
 		double par = ll_y;
 		for (int ka=0; ka<order_V; ++ka, par+=dv)
 		  {
-		    const bool on_end = (par == bfunctions[ki]->vmax());
+		    if (ka == order_V-1)
+		      par = ur_y;
+		    const bool on_end = (par == orig_dom_[3]); //bfunctions[ki]->vmax());
 		    val2[ki*order_V+ka] = uni2->evalBasisFunction(par, 0, on_end);
 		  }
 	      }
@@ -162,7 +166,9 @@ class LRSpline3DEvalGrid
 		double par = ll_z;
 		for (int ka=0; ka<order_W; ++ka, par+=dw)
 		  {
-		    const bool on_end = (par == bfunctions[ki]->wmax());
+		    if (ka == order_W-1)
+		      par = ur_z;
+		    const bool on_end = (par == orig_dom_[5]); //bfunctions[ki]->wmax());
 		    val3[ki*order_W+ka] = uni3->evalBasisFunction(par, 0, on_end);
 		  }
 	      }

lrsplines3D/include/GoTools/lrsplines3D/LRVolApprox.h

@@ -373,6 +373,25 @@ class LRVolApprox
     }
 
 
+     /// Feature output
+    void setFeatureOut(int ncell1, int ncell2, int ncell3)
+    {
+      write_feature_ = true;
+      ncell1_ = ncell1;
+      ncell2_ = ncell2;
+      ncell3_ = ncell3;
+    }
+
+    void unsetFeatureOut()
+    {
+      write_feature_ = false;
+    }
+
+    void setFeatureLevel(std::vector<int>& levels)
+    {
+      feature_levels_ = levels;
+    }
+    
 private:
     shared_ptr<LRSplineVolume> vol_;
     int nmb_pts_;
@@ -430,6 +449,11 @@ class LRVolApprox
     // Variable tolerance 
     std::vector<TolBox> tolerances_;
 
+    // Features output
+    bool write_feature_;
+    int ncell1_, ncell2_, ncell3_;
+    std::vector<int> feature_levels_;
+    
     // DEBUG
     int ref_x_, ref_y_, ref_z_;
     int nmb1_, nmb2_, nmb3_;