From c81423584ecd1287673ddb89344c0b1d07c8e323 Mon Sep 17 00:00:00 2001 From: "Matthew D. Scholefield" Date: Fri, 25 Aug 2017 19:25:14 -0500 Subject: [PATCH] Move Classes to include/fastdtw and create meson build script --- .gitignore | 1 + FastDTW-x.podspec | 16 ----------- .../fastdtw}/BinaryDistance.h | 0 .../fastdtw}/ColMajorCell.h | 0 .../Classes => include/fastdtw}/CostMatrix.h | 0 {FastDTW-x/Classes => include/fastdtw}/DTW.h | 0 .../fastdtw}/EuclideanDistance.h | 0 .../fastdtw}/ExpandedResWindow.h | 0 .../Classes => include/fastdtw}/FDAssert.h | 0 .../Classes => include/fastdtw}/FDMath.h | 0 .../Classes => include/fastdtw}/FastDTW.h | 0 .../Classes => include/fastdtw}/Foundation.h | 0 .../Classes => include/fastdtw}/FullWindow.h | 0 .../Classes => include/fastdtw}/JavaTypes.h | 0 .../fastdtw}/LinearWindow.h | 0 .../fastdtw}/ManhattanDistance.h | 0 .../fastdtw}/MemoryResidentMatrix.h | 0 {FastDTW-x/Classes => include/fastdtw}/PAA.h | 0 .../fastdtw}/PartialWindowMatrix.h | 0 .../fastdtw}/SearchWindow.h | 0 .../Classes => include/fastdtw}/TimeSeries.h | 0 .../fastdtw}/TimeSeriesPoint.h | 0 .../fastdtw}/TimeWarpInfo.h | 0 .../Classes => include/fastdtw}/WarpPath.h | 0 include/fastdtw/meson.build | 27 +++++++++++++++++++ meson.build | 10 +++++++ .../Classes => source}/ColMajorCell.cpp | 0 {FastDTW-x/Classes => source}/FastDTW.cpp | 0 .../Classes => source}/SearchWindow.cpp | 0 {FastDTW-x/Classes => source}/WarpPath.cpp | 0 source/meson.build | 12 +++++++++ 31 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 .gitignore delete mode 100644 FastDTW-x.podspec rename {FastDTW-x/Classes => include/fastdtw}/BinaryDistance.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/ColMajorCell.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/CostMatrix.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/DTW.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/EuclideanDistance.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/ExpandedResWindow.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/FDAssert.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/FDMath.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/FastDTW.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/Foundation.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/FullWindow.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/JavaTypes.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/LinearWindow.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/ManhattanDistance.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/MemoryResidentMatrix.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/PAA.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/PartialWindowMatrix.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/SearchWindow.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/TimeSeries.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/TimeSeriesPoint.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/TimeWarpInfo.h (100%) rename {FastDTW-x/Classes => include/fastdtw}/WarpPath.h (100%) create mode 100644 include/fastdtw/meson.build create mode 100755 meson.build rename {FastDTW-x/Classes => source}/ColMajorCell.cpp (100%) rename {FastDTW-x/Classes => source}/FastDTW.cpp (100%) rename {FastDTW-x/Classes => source}/SearchWindow.cpp (100%) rename {FastDTW-x/Classes => source}/WarpPath.cpp (100%) create mode 100755 source/meson.build diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/FastDTW-x.podspec b/FastDTW-x.podspec deleted file mode 100644 index 86d11d8..0000000 --- a/FastDTW-x.podspec +++ /dev/null @@ -1,16 +0,0 @@ -Pod::Spec.new do |s| - s.name = "FastDTW-x" - s.version = "1.1.0" - s.summary = "C++ porting of Stan Salvador's FastDTW." - s.homepage = "https://github.com/melode11/FastDTW-x" - s.license = {:type => 'MIT'} - s.author = {"Melo Yao" => "melode11@gmail.com" } - s.source = {:git => "https://github.com/melode11/FastDTW-x.git", :tag => "#{s.version}" } - s.source_files = 'FastDTW-x/Classes/**/*.{h,cpp}' - s.requires_arc = false - s.xcconfig = { - 'CLANG_CXX_LANGUAGE_STANDARD' => 'gnu++11', - 'CLANG_CXX_LIBRARY' => 'libstdc++' - } - -end \ No newline at end of file diff --git a/FastDTW-x/Classes/BinaryDistance.h b/include/fastdtw/BinaryDistance.h similarity index 100% rename from FastDTW-x/Classes/BinaryDistance.h rename to include/fastdtw/BinaryDistance.h diff --git a/FastDTW-x/Classes/ColMajorCell.h b/include/fastdtw/ColMajorCell.h similarity index 100% rename from FastDTW-x/Classes/ColMajorCell.h rename to include/fastdtw/ColMajorCell.h diff --git a/FastDTW-x/Classes/CostMatrix.h b/include/fastdtw/CostMatrix.h similarity index 100% rename from FastDTW-x/Classes/CostMatrix.h rename to include/fastdtw/CostMatrix.h diff --git a/FastDTW-x/Classes/DTW.h b/include/fastdtw/DTW.h similarity index 100% rename from FastDTW-x/Classes/DTW.h rename to include/fastdtw/DTW.h diff --git a/FastDTW-x/Classes/EuclideanDistance.h b/include/fastdtw/EuclideanDistance.h similarity index 100% rename from FastDTW-x/Classes/EuclideanDistance.h rename to include/fastdtw/EuclideanDistance.h diff --git a/FastDTW-x/Classes/ExpandedResWindow.h b/include/fastdtw/ExpandedResWindow.h similarity index 100% rename from FastDTW-x/Classes/ExpandedResWindow.h rename to include/fastdtw/ExpandedResWindow.h diff --git a/FastDTW-x/Classes/FDAssert.h b/include/fastdtw/FDAssert.h similarity index 100% rename from FastDTW-x/Classes/FDAssert.h rename to include/fastdtw/FDAssert.h diff --git a/FastDTW-x/Classes/FDMath.h b/include/fastdtw/FDMath.h similarity index 100% rename from FastDTW-x/Classes/FDMath.h rename to include/fastdtw/FDMath.h diff --git a/FastDTW-x/Classes/FastDTW.h b/include/fastdtw/FastDTW.h similarity index 100% rename from FastDTW-x/Classes/FastDTW.h rename to include/fastdtw/FastDTW.h diff --git a/FastDTW-x/Classes/Foundation.h b/include/fastdtw/Foundation.h similarity index 100% rename from FastDTW-x/Classes/Foundation.h rename to include/fastdtw/Foundation.h diff --git a/FastDTW-x/Classes/FullWindow.h b/include/fastdtw/FullWindow.h similarity index 100% rename from FastDTW-x/Classes/FullWindow.h rename to include/fastdtw/FullWindow.h diff --git a/FastDTW-x/Classes/JavaTypes.h b/include/fastdtw/JavaTypes.h similarity index 100% rename from FastDTW-x/Classes/JavaTypes.h rename to include/fastdtw/JavaTypes.h diff --git a/FastDTW-x/Classes/LinearWindow.h b/include/fastdtw/LinearWindow.h similarity index 100% rename from FastDTW-x/Classes/LinearWindow.h rename to include/fastdtw/LinearWindow.h diff --git a/FastDTW-x/Classes/ManhattanDistance.h b/include/fastdtw/ManhattanDistance.h similarity index 100% rename from FastDTW-x/Classes/ManhattanDistance.h rename to include/fastdtw/ManhattanDistance.h diff --git a/FastDTW-x/Classes/MemoryResidentMatrix.h b/include/fastdtw/MemoryResidentMatrix.h similarity index 100% rename from FastDTW-x/Classes/MemoryResidentMatrix.h rename to include/fastdtw/MemoryResidentMatrix.h diff --git a/FastDTW-x/Classes/PAA.h b/include/fastdtw/PAA.h similarity index 100% rename from FastDTW-x/Classes/PAA.h rename to include/fastdtw/PAA.h diff --git a/FastDTW-x/Classes/PartialWindowMatrix.h b/include/fastdtw/PartialWindowMatrix.h similarity index 100% rename from FastDTW-x/Classes/PartialWindowMatrix.h rename to include/fastdtw/PartialWindowMatrix.h diff --git a/FastDTW-x/Classes/SearchWindow.h b/include/fastdtw/SearchWindow.h similarity index 100% rename from FastDTW-x/Classes/SearchWindow.h rename to include/fastdtw/SearchWindow.h diff --git a/FastDTW-x/Classes/TimeSeries.h b/include/fastdtw/TimeSeries.h similarity index 100% rename from FastDTW-x/Classes/TimeSeries.h rename to include/fastdtw/TimeSeries.h diff --git a/FastDTW-x/Classes/TimeSeriesPoint.h b/include/fastdtw/TimeSeriesPoint.h similarity index 100% rename from FastDTW-x/Classes/TimeSeriesPoint.h rename to include/fastdtw/TimeSeriesPoint.h diff --git a/FastDTW-x/Classes/TimeWarpInfo.h b/include/fastdtw/TimeWarpInfo.h similarity index 100% rename from FastDTW-x/Classes/TimeWarpInfo.h rename to include/fastdtw/TimeWarpInfo.h diff --git a/FastDTW-x/Classes/WarpPath.h b/include/fastdtw/WarpPath.h similarity index 100% rename from FastDTW-x/Classes/WarpPath.h rename to include/fastdtw/WarpPath.h diff --git a/include/fastdtw/meson.build b/include/fastdtw/meson.build new file mode 100644 index 0000000..64c0654 --- /dev/null +++ b/include/fastdtw/meson.build @@ -0,0 +1,27 @@ +headers = [ + 'ExpandedResWindow.h', + 'SearchWindow.h', + 'DTW.h', + 'ManhattanDistance.h', + 'TimeSeries.h', + 'PartialWindowMatrix.h', + 'EuclideanDistance.h', + 'JavaTypes.h', + 'PAA.h', + 'FastDTW.h', + 'LinearWindow.h', + 'FDMath.h', + 'BinaryDistance.h', + 'WarpPath.h', + 'ColMajorCell.h', + 'CostMatrix.h', + 'TimeSeriesPoint.h', + 'TimeWarpInfo.h', + 'MemoryResidentMatrix.h', + 'meson.build', + 'FDAssert.h', + 'Foundation.h', + 'FullWindow.h' +] + +install_headers(headers, subdir : 'fastdtw') diff --git a/meson.build b/meson.build new file mode 100755 index 0000000..6f76681 --- /dev/null +++ b/meson.build @@ -0,0 +1,10 @@ +project('fastdtw', 'cpp', license : 'MIT') + +inc_priv = include_directories('include/fastdtw') +inc = include_directories('include') + +subdir('include/fastdtw') +subdir('source') + +dep = declare_dependency(link_with : lib, include_directories : inc) + diff --git a/FastDTW-x/Classes/ColMajorCell.cpp b/source/ColMajorCell.cpp similarity index 100% rename from FastDTW-x/Classes/ColMajorCell.cpp rename to source/ColMajorCell.cpp diff --git a/FastDTW-x/Classes/FastDTW.cpp b/source/FastDTW.cpp similarity index 100% rename from FastDTW-x/Classes/FastDTW.cpp rename to source/FastDTW.cpp diff --git a/FastDTW-x/Classes/SearchWindow.cpp b/source/SearchWindow.cpp similarity index 100% rename from FastDTW-x/Classes/SearchWindow.cpp rename to source/SearchWindow.cpp diff --git a/FastDTW-x/Classes/WarpPath.cpp b/source/WarpPath.cpp similarity index 100% rename from FastDTW-x/Classes/WarpPath.cpp rename to source/WarpPath.cpp diff --git a/source/meson.build b/source/meson.build new file mode 100755 index 0000000..a703912 --- /dev/null +++ b/source/meson.build @@ -0,0 +1,12 @@ +sources = [ + 'ColMajorCell.cpp', + 'FastDTW.cpp', + 'SearchWindow.cpp', + 'WarpPath.cpp' +] + +lib = shared_library('fastdtw', + sources, + include_directories : inc_priv, + cpp_args : '-w', + install : true)