Mercurial > hg > match-vamp
changeset 187:ba0d2104abec re-minimise
Types.h -> MatchTypes.h
| author | Chris Cannam |
|---|---|
| date | Thu, 26 Feb 2015 10:48:36 +0000 |
| parents | af6120a32063 |
| children | 487261a22b18 |
| files | Makefile.inc src/DistanceMetric.h src/FeatureConditioner.h src/FeatureExtractor.h src/MatchTypes.h src/Matcher.h src/Types.h |
| diffstat | 7 files changed, 82 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Thu Feb 26 10:38:59 2015 +0000 +++ b/Makefile.inc Thu Feb 26 10:48:36 2015 +0000 @@ -40,28 +40,28 @@ src/Path.o: src/Path.h src/FeatureConditioner.o: src/FeatureConditioner.h src/MatchFeatureFeeder.o: src/MatchFeatureFeeder.h src/Matcher.h -src/MatchFeatureFeeder.o: src/DistanceMetric.h src/Types.h src/Finder.h +src/MatchFeatureFeeder.o: src/DistanceMetric.h src/MatchTypes.h src/Finder.h src/FeatureExtractor.o: src/FeatureExtractor.h -src/Finder.o: src/Finder.h src/Matcher.h src/DistanceMetric.h src/Types.h +src/Finder.o: src/Finder.h src/Matcher.h src/DistanceMetric.h src/MatchTypes.h src/Finder.o: src/Path.h -src/Matcher.o: src/Matcher.h src/DistanceMetric.h src/Types.h +src/Matcher.o: src/Matcher.h src/DistanceMetric.h src/MatchTypes.h src/MatchPipeline.o: src/MatchPipeline.h src/Matcher.h src/DistanceMetric.h -src/MatchPipeline.o: src/Types.h src/Finder.h src/FeatureExtractor.h +src/MatchPipeline.o: src/MatchTypes.h src/Finder.h src/FeatureExtractor.h src/MatchPipeline.o: src/FeatureConditioner.h src/MatchFeatureFeeder.h src/MatchVampPlugin.o: src/MatchVampPlugin.h src/MatchPipeline.h -src/MatchVampPlugin.o: src/Matcher.h src/DistanceMetric.h src/Types.h +src/MatchVampPlugin.o: src/Matcher.h src/DistanceMetric.h src/MatchTypes.h src/MatchVampPlugin.o: src/Finder.h src/FeatureExtractor.h src/MatchVampPlugin.o: src/FeatureConditioner.h src/MatchFeatureFeeder.h src/MatchVampPlugin.o: src/Path.h -src/MatchFeatureFeeder.o: src/Matcher.h src/DistanceMetric.h src/Types.h +src/MatchFeatureFeeder.o: src/Matcher.h src/DistanceMetric.h src/MatchTypes.h src/MatchFeatureFeeder.o: src/Finder.h -src/Finder.o: src/Matcher.h src/DistanceMetric.h src/Types.h -src/Matcher.o: src/DistanceMetric.h src/Types.h -src/MatchPipeline.o: src/Matcher.h src/DistanceMetric.h src/Types.h +src/Finder.o: src/Matcher.h src/DistanceMetric.h src/MatchTypes.h +src/Matcher.o: src/DistanceMetric.h src/MatchTypes.h +src/MatchPipeline.o: src/Matcher.h src/DistanceMetric.h src/MatchTypes.h src/MatchPipeline.o: src/Finder.h src/FeatureExtractor.h src/MatchPipeline.o: src/FeatureConditioner.h src/MatchFeatureFeeder.h src/MatchVampPlugin.o: src/MatchPipeline.h src/Matcher.h src/DistanceMetric.h -src/MatchVampPlugin.o: src/Types.h src/Finder.h src/FeatureExtractor.h +src/MatchVampPlugin.o: src/MatchTypes.h src/Finder.h src/FeatureExtractor.h src/MatchVampPlugin.o: src/FeatureConditioner.h src/MatchFeatureFeeder.h test/TestFeatureConditioner.o: src/FeatureConditioner.h test/TestDistanceMetric.o: src/DistanceMetric.h
--- a/src/DistanceMetric.h Thu Feb 26 10:38:59 2015 +0000 +++ b/src/DistanceMetric.h Thu Feb 26 10:48:36 2015 +0000 @@ -17,7 +17,7 @@ #ifndef DISTANCE_METRIC_H #define DISTANCE_METRIC_H -#include "Types.h" +#include "MatchTypes.h" class DistanceMetric {
--- a/src/FeatureConditioner.h Thu Feb 26 10:38:59 2015 +0000 +++ b/src/FeatureConditioner.h Thu Feb 26 10:48:36 2015 +0000 @@ -16,7 +16,7 @@ #ifndef FEATURE_CONDITIONER_H #define FEATURE_CONDITIONER_H -#include "Types.h" +#include "MatchTypes.h" /** * Take a series of feature vectors and apply conditioning of some
--- a/src/FeatureExtractor.h Thu Feb 26 10:38:59 2015 +0000 +++ b/src/FeatureExtractor.h Thu Feb 26 10:48:36 2015 +0000 @@ -17,7 +17,7 @@ #ifndef FEATURE_EXTRACTOR_H #define FEATURE_EXTRACTOR_H -#include "Types.h" +#include "MatchTypes.h" /** * Convert frequency-domain audio frames into features suitable for
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/MatchTypes.h Thu Feb 26 10:48:36 2015 +0000 @@ -0,0 +1,68 @@ +/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ + +/* + Vamp feature extraction plugin using the MATCH audio alignment + algorithm. + + Centre for Digital Music, Queen Mary, University of London. + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. See the file + COPYING included with this distribution for more information. +*/ + +#ifndef MATCH_TYPES_H +#define MATCH_TYPES_H + +#include <vector> +#include <cstdint> + +/// A single value in a feature vector +typedef float featurebin_t; + +/// A feature vector +typedef std::vector<featurebin_t> feature_t; + +/// A sequence of feature vectors +typedef std::vector<feature_t> featureseq_t; + +/// The distance between two feature vectors +typedef uint8_t distance_t; + +const int InvalidDistance = 0xff; + +/// A distance vector +typedef std::vector<distance_t> distancevec_t; + +/// A distance matrix +typedef std::vector<distancevec_t> distancemat_t; + +/// The integrated distance (path cost) from the origin to a given point +typedef uint32_t pathcost_t; + +const int InvalidPathCost = 0xdeadbeef; + +/// A vector of path costs +typedef std::vector<pathcost_t> pathcostvec_t; + +/// A matrix of path costs +typedef std::vector<pathcostvec_t> pathcostmat_t; + +/// A direction advance instruction or state +enum advance_t : uint8_t { + AdvanceNone, + AdvanceBoth, + AdvanceThis, + AdvanceOther +}; + +/// A vector of advance directions +typedef std::vector<advance_t> advancevec_t; + +/// A matrix of advance directions +typedef std::vector<advancevec_t> advancemat_t; + + +#endif
--- a/src/Matcher.h Thu Feb 26 10:38:59 2015 +0000 +++ b/src/Matcher.h Thu Feb 26 10:48:36 2015 +0000 @@ -23,7 +23,7 @@ #include <cmath> #include "DistanceMetric.h" -#include "Types.h" +#include "MatchTypes.h" using std::vector; using std::string;
--- a/src/Types.h Thu Feb 26 10:38:59 2015 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,68 +0,0 @@ -/* -*- c-basic-offset: 4 indent-tabs-mode: nil -*- vi:set ts=8 sts=4 sw=4: */ - -/* - Vamp feature extraction plugin using the MATCH audio alignment - algorithm. - - Centre for Digital Music, Queen Mary, University of London. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. See the file - COPYING included with this distribution for more information. -*/ - -#ifndef MATCH_TYPES_H -#define MATCH_TYPES_H - -#include <vector> -#include <cstdint> - -/// A single value in a feature vector -typedef float featurebin_t; - -/// A feature vector -typedef std::vector<featurebin_t> feature_t; - -/// A sequence of feature vectors -typedef std::vector<feature_t> featureseq_t; - -/// The distance between two feature vectors -typedef uint8_t distance_t; - -const int InvalidDistance = 0xff; - -/// A distance vector -typedef std::vector<distance_t> distancevec_t; - -/// A distance matrix -typedef std::vector<distancevec_t> distancemat_t; - -/// The integrated distance (path cost) from the origin to a given point -typedef uint32_t pathcost_t; - -const int InvalidPathCost = 0xdeadbeef; - -/// A vector of path costs -typedef std::vector<pathcost_t> pathcostvec_t; - -/// A matrix of path costs -typedef std::vector<pathcostvec_t> pathcostmat_t; - -/// A direction advance instruction or state -enum advance_t : uint8_t { - AdvanceNone, - AdvanceBoth, - AdvanceThis, - AdvanceOther -}; - -/// A vector of advance directions -typedef std::vector<advance_t> advancevec_t; - -/// A matrix of advance directions -typedef std::vector<advancevec_t> advancemat_t; - - -#endif