realigned code

CMakeLists.txt

@@ -3,10 +3,10 @@ project(p4TSA)
 # The version number.
 
 if(NOT p4TSA_VERSION)
-  SET(p4TSA_VERSION_MAJOR 1)
+  SET(p4TSA_VERSION_MAJOR 2)
   SET(p4TSA_VERSION_MINOR 0)
-  SET(p4TSA_VERSION_PATCH 0)
-  SET(p4TSA_VERSION 1.0.0)
+  SET(p4TSA_VERSION_PATCH 1)
+  SET(p4TSA_VERSION 2.0.1)
 endif(NOT p4TSA_VERSION)
 
 set(CMAKE_CXX_STANDARD 11)
@@ -70,7 +70,7 @@ link_libraries(gsl fftw3  gslcblas framel)
 add_library(p4TSA SHARED ${SOURCE_FILES})
 install (TARGETS p4TSA DESTINATION $ENV{ENV_ROOT}/lib)
 install (FILES include/tsa.hpp DESTINATION $ENV{ENV_ROOT}/include)
-
+ 
 # Add the cmake folder so the FindSphinx module is found
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 if(DEFINED ENV{READTHEDOCS})

include/FrameIChannel.hpp

@@ -105,7 +105,7 @@ namespace tsa {
         ///
         //@{
 
-        double NextSlice();
+        void NextSlice();
 
 
         //@}

python-wrapper/pytsa.cpp

@@ -3558,7 +3558,7 @@ void bind_FrameIChannel(std::function< pybind11::module &(std::string const &nam
 		cl.def( pybind11::init<const std::string &, const std::string &, double, double>(), pybind11::arg("fileName"), pybind11::arg("channelName"), pybind11::arg("dLength"), pybind11::arg("tStart") );
 
 		cl.def( pybind11::init( [](tsa::FrameIChannel const &o){ return new tsa::FrameIChannel(o); } ) );
-		cl.def("NextSlice", (double (tsa::FrameIChannel::*)()) &tsa::FrameIChannel::NextSlice, "C++: tsa::FrameIChannel::NextSlice() --> double");
+		cl.def("NextSlice", (void (tsa::FrameIChannel::*)()) &tsa::FrameIChannel::NextSlice, "C++: tsa::FrameIChannel::NextSlice() --> void");
 		cl.def("GetData", (bool (tsa::FrameIChannel::*)(class tsa::SeqView<double> &, double, double)) &tsa::FrameIChannel::GetData, "Get a specified slice of data. After this call, start time will be\n set to tStart+dLength and data length to dLength\n\n \n the view to fill with data\n \n\n start time of the data returned \n \n\n length of data returned by \n\nC++: tsa::FrameIChannel::GetData(class tsa::SeqView<double> &, double, double) --> bool", pybind11::arg("rSeqView"), pybind11::arg("tStart"), pybind11::arg("dLength"));
 		cl.def("GetData", (bool (tsa::FrameIChannel::*)(class tsa::SeqView<double> &)) &tsa::FrameIChannel::GetData, "Get a slice of data the current data length, starting \n from the current start time.\n\n \n the view to fill with data\n\nC++: tsa::FrameIChannel::GetData(class tsa::SeqView<double> &) --> bool", pybind11::arg("rSeqView"));
 		cl.def_static("GetChannelList", [](const std::string & a0) -> std::string { return tsa::FrameIChannel::GetChannelList(a0); }, "", pybind11::arg("fileName"));

python-wrapper/setup.py

@@ -4,7 +4,7 @@
 import setuptools
 import os
 
-__version__ = '2.0.0'
+__version__ = '2.0.1'
 
 ENV_INCLUDE=os.environ['ENV_ROOT']+'/include'
 ENV_LIB=os.environ['ENV_ROOT']+'/lib'

src/FrameIChannel.cpp

@@ -132,7 +132,7 @@ namespace tsa {
         return tmp;
     }
 
-    double FrameIChannel::NextSlice() {
+    void FrameIChannel::NextSlice() {
         mStartTime += mDataLength;
     }
 

src/ViewUtil.cpp

@@ -1107,7 +1107,7 @@ namespace tsa {
         unsigned int s1 = data1->size1();
 
         if (((unsigned int) data2->size1() != s1)) {
-            fprintf(stderr, "%d %d\n", data1->size1(), data2->size1());
+            fprintf(stderr, "%ld %ld\n", data1->size1(), data2->size1());
             LogSevere("Wrong size for input views");
             throw std::runtime_error("Util::ProdConj");
         }

src/WaveletTransform.cpp

@@ -248,13 +248,13 @@ namespace tsa {
 
         for (i = 1; i < (n < 10 ? n : 10); i++) {
             printf
-                    (" h1(%d):%12.8f   g1(%d):%12.8f       h2(%d):%12.8f   g2(%d):%12.8f\n",
+                    (" h1(%ld):%12.8f   g1(%ld):%12.8f       h2(%ld):%12.8f   g2(%ld):%12.8f\n",
                     i, mW->h1[ i ], i, mW->g1[ i ], i, mW->h2[ i ], i, mW->g2[ i ]);
         }
 
         for (; i < n; i++) {
             printf
-                    ("h1(%d):%12.8f  g1(%d):%12.8f      h2(%d):%12.8f  g2(%d):%12.8f\n",
+                    ("h1(%ld):%12.8f  g1(%ld):%12.8f      h2(%ld):%12.8f  g2(%ld):%12.8f\n",
                     i, mW->h1[ i ], i, mW->g1[ i ], i, mW->h2[ i ], i, mW->g2[ i ]);
         }
     }