From 85d76052ce8aac7dc62d31c7cac5f8877556ed5a Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 14 Jun 2016 12:34:46 +0100
Subject: [PATCH] more consistent naming of utilities

---
 utils/Makefile.am                             | 24 +++++++++----------
 ...{sample_combine.cpp => sample-combine.cpp} |  0
 .../{make_fake_sample.cpp => sample-fake.cpp} |  0
 ...ple_plot_corr.cpp => sample-plot-corr.cpp} |  1 +
 utils/{sample_read.cpp => sample-read.cpp}    |  0
 5 files changed, 13 insertions(+), 12 deletions(-)
 rename utils/{sample_combine.cpp => sample-combine.cpp} (100%)
 rename utils/{make_fake_sample.cpp => sample-fake.cpp} (100%)
 rename utils/{sample_plot_corr.cpp => sample-plot-corr.cpp} (96%)
 rename utils/{sample_read.cpp => sample-read.cpp} (100%)

diff --git a/utils/Makefile.am b/utils/Makefile.am
index 1eba782..2f76091 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -7,25 +7,25 @@ endif
 endif
 
 bin_PROGRAMS =            \
-    latan_make_fake_sample\
-    latan_sample_combine  \
-    latan_sample_plot_corr\
-    latan_sample_read     \
-    latan_resample
+    latan-sample-combine  \
+    latan-sample-fake     \
+    latan-sample-plot-corr\
+    latan-sample-read     \
+    latan-resample
 
-latan_make_fake_sample_SOURCES  = make_fake_sample.cpp
-latan_make_fake_sample_CXXFLAGS = $(COM_CXXFLAGS)
-latan_make_fake_sample_LDFLAGS  = -L../lib/.libs -lLatAnalyze
-
-latan_sample_combine_SOURCES  = sample_combine.cpp
+latan_sample_combine_SOURCES  = sample-combine.cpp
 latan_sample_combine_CXXFLAGS = $(COM_CXXFLAGS)
 latan_sample_combine_LDFLAGS  = -L../lib/.libs -lLatAnalyze
 
-latan_sample_plot_corr_SOURCES  = sample_plot_corr.cpp
+latan_sample_fake_SOURCES  = sample-fake.cpp
+latan_sample_fake_CXXFLAGS = $(COM_CXXFLAGS)
+latan_sample_fake_LDFLAGS  = -L../lib/.libs -lLatAnalyze
+
+latan_sample_plot_corr_SOURCES  = sample-plot-corr.cpp
 latan_sample_plot_corr_CXXFLAGS = $(COM_CXXFLAGS)
 latan_sample_plot_corr_LDFLAGS  = -L../lib/.libs -lLatAnalyze
 
-latan_sample_read_SOURCES  = sample_read.cpp
+latan_sample_read_SOURCES  = sample-read.cpp
 latan_sample_read_CXXFLAGS = $(COM_CXXFLAGS)
 latan_sample_read_LDFLAGS  = -L../lib/.libs -lLatAnalyze
 
diff --git a/utils/sample_combine.cpp b/utils/sample-combine.cpp
similarity index 100%
rename from utils/sample_combine.cpp
rename to utils/sample-combine.cpp
diff --git a/utils/make_fake_sample.cpp b/utils/sample-fake.cpp
similarity index 100%
rename from utils/make_fake_sample.cpp
rename to utils/sample-fake.cpp
diff --git a/utils/sample_plot_corr.cpp b/utils/sample-plot-corr.cpp
similarity index 96%
rename from utils/sample_plot_corr.cpp
rename to utils/sample-plot-corr.cpp
index 12c22e8..638abd2 100644
--- a/utils/sample_plot_corr.cpp
+++ b/utils/sample-plot-corr.cpp
@@ -42,6 +42,7 @@ int main(int argc, char *argv[])
     cout << "-- computing variance matrix from '" << fileName << "'..." << endl;
     name   = Io::getFirstName(fileName);
     sample = Io::load<DMatSample>(fileName);
+    sample = sample.block(0, 0, sample[central].rows(), 1);
     var    = sample.varianceMatrix();
     p << PlotMatrix(varToCorr(var));
     p.display();
diff --git a/utils/sample_read.cpp b/utils/sample-read.cpp
similarity index 100%
rename from utils/sample_read.cpp
rename to utils/sample-read.cpp