fix typo

examples/example-get-Mie.cc

@@ -28,7 +28,7 @@
 #include <complex>
 #include <cstdio>
 #include <string>
-#include "../src/nmie-applied.h"
+#include "../src/nmie-applied.hpp"
 #include "./read-spectra.h"
 template<class T> inline T pow2(const T value) {return value*value;}
 int main(int argc, char *argv[]) {

src/nmie-applied.cc

@@ -74,7 +74,7 @@ namespace nmie {
     if (Theta.size() != nTheta)
         throw std::invalid_argument("Declared number of sample for Theta is not correct!");
     try {
-      MultiLayerMieApplied ml_mie;
+      MultiLayerMieApplied<> ml_mie;
       ml_mie.SetLayersSize(x);
       ml_mie.SetLayersIndex(m);
       ml_mie.SetAngles(Theta);

src/nmie-applied.hpp

@@ -1,5 +1,5 @@
-#ifndef SRC_NMIE_APPLIED_H_
-#define SRC_NMIE_APPLIED_H_
+#ifndef SRC_NMIE_APPLIED_HPP_
+#define SRC_NMIE_APPLIED_HPP_
 //**********************************************************************************//
 //    Copyright (C) 2009-2016  Ovidio Pena <ovidio@bytesfall.com>                   //
 //    Copyright (C) 2013-2016  Konstantin Ladutenko <kostyfisik@gmail.com>          //
@@ -44,7 +44,7 @@ namespace nmie {
 
 
   template <typename FloatType = double>
-  class MultiLayerMieApplied : public MultiLayerMie {
+  class MultiLayerMieApplied : public MultiLayerMie<FloatType> {
     // Will throw for any error!
    public:
     void RunMieCalculation();
@@ -163,4 +163,4 @@ namespace nmie {
   };  // end of class MultiLayerMie
 
 }  // end of namespace nmie
-#endif  // SRC_NMIE_APPLIED_H
+#endif  // SRC_NMIE_APPLIED_HPP

src/nmie-impl.hpp

@@ -1,5 +1,5 @@
-#ifndef SRC_NMIE_IMPL_H_
-#define SRC_NMIE_IMPL_H_
+#ifndef SRC_NMIE_IMPL_HPP_
+#define SRC_NMIE_IMPL_HPP_
 //**********************************************************************************//
 //    Copyright (C) 2009-2016  Ovidio Pena <ovidio@bytesfall.com>                   //
 //    Copyright (C) 2013-2016  Konstantin Ladutenko <kostyfisik@gmail.com>          //
@@ -73,7 +73,7 @@ namespace nmie {
   }  
 
   template <typename ToFloatType, typename FromFloatType>
-  std::vector<ToFloatType> ConvertVector(std::vector<FromFloatType> x) {
+  std::vector<ToFloatType> ConvertVector(const std::vector<FromFloatType> x) {
     std::vector<ToFloatType> new_x;
     for (auto element : x) {
       new_x.push_back(static_cast<ToFloatType>(element));
@@ -1157,4 +1157,4 @@ namespace nmie {
     }  // end of for all field coordinates
   }  //  end of MultiLayerMie::RunFieldCalculation()
 }  // end of namespace nmie
-#endif  // SRC_NMIE_IMPL_H_
+#endif  // SRC_NMIE_IMPL_HPP_

src/nmie.hpp

@@ -1,5 +1,5 @@
-#ifndef SRC_NMIE_H_
-#define SRC_NMIE_H_
+#ifndef SRC_NMIE_HPP_
+#define SRC_NMIE_HPP_
 //**********************************************************************************//
 //    Copyright (C) 2009-2016  Ovidio Pena <ovidio@bytesfall.com>                   //
 //    Copyright (C) 2013-2016  Konstantin Ladutenko <kostyfisik@gmail.com>          //
@@ -176,4 +176,4 @@ namespace nmie {
   };  // end of class MultiLayerMie
 
 }  // end of namespace nmie
-#endif  // SRC_NMIE_H_
+#endif  // SRC_NMIE_HPP_

tests/c++/go-speed-test.sh

@@ -9,11 +9,12 @@ rm -f $PROGRAM
 # file=speed-test.cc
 # g++ -Ofast -std=c++11 $file ../../src/nmie.cc  -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
 
-file=speed-test.cc
+# file=speed-test.cc
 # g++ -Ofast -std=c++11 $file ../../src/nmie.cc -DMULTI_PRECISION=200  -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc_minimal.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
-g++ -Ofast -std=c++11 $file ../../src/nmie.cc  -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc_minimal.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
+#g++ -Ofast -std=c++11 $file ../../src/nmie.cc  -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc_minimal.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
 
-#file=speed-test-applied.cc
+file=speed-test-applied.cc
+g++ -Ofast -std=c++11 $file ../../src/nmie.cc ../../src/nmie-applied.cc -DMULTI_PRECISION=200 -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc_minimal.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
 # g++ -Ofast -std=c++11 $file ../../src/nmie.cc ../../src/nmie-applied.cc -lm -lrt -o $PROGRAM /usr/lib/libtcmalloc_minimal.so.4 -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -march=native -mtune=native -msse4.2
 
 echo Should be: