WSL/SLF GitLab Repository

Commit 20950148 authored by Thomas Egger's avatar Thomas Egger
Browse files

Reorganization of the code - filter system now moved to folder meteoio/meteofilters/

parent 7507f070
......@@ -9,16 +9,10 @@ IF(PROJ4)
ENDIF(PROJ4)
INCLUDE("${PROJECT_SOURCE_DIR}/meteoio/meteolaws/CMakeLists.txt")
INCLUDE("${PROJECT_SOURCE_DIR}/meteoio/meteofilters/CMakeLists.txt")
SET(meteoio_sources
IOManager.cc
WindowedFilter.cc
ProcessingStack.cc
FilterMeanAvg.cc
FilterMedianAvg.cc
FilterBlock.cc
FilterMinMax.cc
ProcessingBlock.cc
Matrix.cc
IOPlugin.cc
MeteoProcessor.cc
......@@ -48,6 +42,7 @@ SET(meteoio_sources
libinterpol2D.cc
MeteoData.cc
${meteolaws_sources}
${meteofilters_sources}
)
if (DEST MATCHES "par")
......
......@@ -20,6 +20,7 @@
#include <meteoio/BufferedIOHandler.h>
#include <meteoio/Meteo2DInterpolator.h>
#include <meteoio/MeteoProcessor.h>
namespace mio {
......
......@@ -23,7 +23,7 @@
#include <meteoio/Config.h>
#include <meteoio/MeteoFilter.h>
#include <meteoio/Meteo1DInterpolator.h>
#include <meteoio/ProcessingStack.h>
#include <meteoio/meteofilters/ProcessingStack.h>
#include <vector>
#include <set>
......
#OPTION( BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON )
INCLUDE_DIRECTORIES("${PROJECT_SOURCE_DIR}/")
SET(meteofilters_sources
meteofilters/FilterMinMax.cc
meteofilters/FilterMedianAvg.cc
meteofilters/FilterMeanAvg.cc
meteofilters/FilterBlock.cc
meteofilters/WindowedFilter.cc
meteofilters/ProcessingBlock.cc
meteofilters/ProcessingStack.cc
)
......@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/FilterMeanAvg.h>
#include <meteoio/meteofilters/FilterMeanAvg.h>
using namespace std;
......
......@@ -18,7 +18,7 @@
#ifndef __FILTERMEANAVG_H__
#define __FILTERMEANAVG_H__
#include <meteoio/WindowedFilter.h>
#include <meteoio/meteofilters/WindowedFilter.h>
#include <vector>
#include <string>
......
......@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/FilterMedianAvg.h>
#include <meteoio/meteofilters/FilterMedianAvg.h>
using namespace std;
......
......@@ -18,7 +18,7 @@
#ifndef __FILTERMEDIANAVG_H__
#define __FILTERMEDIANAVG_H__
#include <meteoio/WindowedFilter.h>
#include <meteoio/meteofilters/WindowedFilter.h>
#include <meteoio/libinterpol1D.h>
#include <vector>
#include <string>
......
......@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/FilterMinMax.h>
#include <meteoio/meteofilters/FilterMinMax.h>
using namespace std;
......
......@@ -18,10 +18,9 @@
#ifndef __FILTERMINMAX_H__
#define __FILTERMINMAX_H__
#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
//#define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
#include <meteoio/MeteoData.h>
#include <meteoio/FilterBlock.h>
#include <meteoio/meteofilters/FilterBlock.h>
#include <vector>
#include <string>
......@@ -47,10 +46,6 @@ class FilterMinMax : public FilterBlock {
bool is_soft;
double min_val, max_val;
double min_soft, max_soft;
//bool fixed_rate();
//unsigned int fixed_rate_ninput_to_noutput(const unsigned int& ninput); //how many output samples?
//unsigned int fixed_rate_noutput_to_ninput(const unsigned int& noutput);//how many input samples?
};
} //end namespace
......
......@@ -15,10 +15,10 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/ProcessingBlock.h>
#include <meteoio/FilterMinMax.h>
#include <meteoio/FilterMeanAvg.h>
#include <meteoio/FilterMedianAvg.h>
#include <meteoio/meteofilters/ProcessingBlock.h>
#include <meteoio/meteofilters/FilterMinMax.h>
#include <meteoio/meteofilters/FilterMeanAvg.h>
#include <meteoio/meteofilters/FilterMedianAvg.h>
namespace mio {
......@@ -54,9 +54,7 @@ ProcessingBlock* BlockFactory::getBlock(const std::string& blockname, const std:
}
ProcessingBlock::ProcessingBlock(const std::string& name) : block_name(name)
{
}
{}
std::string ProcessingBlock::getName() const
{
......
......@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/ProcessingStack.h>
#include <meteoio/meteofilters/ProcessingStack.h>
using namespace std;
......
......@@ -18,7 +18,7 @@
#ifndef __PROCESSINGSTACK_H__
#define __PROCESSINGSTACK_H__
#include <meteoio/ProcessingBlock.h>
#include <meteoio/meteofilters/ProcessingBlock.h>
#include <meteoio/Config.h>
#include <memory>
#include <vector>
......
......@@ -15,7 +15,7 @@
You should have received a copy of the GNU Lesser General Public License
along with MeteoIO. If not, see <http://www.gnu.org/licenses/>.
*/
#include <meteoio/WindowedFilter.h>
#include <meteoio/meteofilters/WindowedFilter.h>
using namespace std;
......
......@@ -18,7 +18,7 @@
#ifndef __WINDOWEDFILTER_H__
#define __WINDOWEDFILTER_H__
#include <meteoio/FilterBlock.h>
#include <meteoio/meteofilters/FilterBlock.h>
#include <vector>
#include <string>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment