# HG changeset patch # User Chris Cannam # Date 1538661441 -3600 # Node ID 2c54d83a196f76d9664f338b47d90bbaf383d794 # Parent a1879532385ec083ca6893678c6cc30f0f227d7a Remove a parameter that never had any implementation diff -r a1879532385e -r 2c54d83a196f FChTransformF0gram.cpp --- a/FChTransformF0gram.cpp Thu Oct 04 14:56:41 2018 +0100 +++ b/FChTransformF0gram.cpp Thu Oct 04 14:57:21 2018 +0100 @@ -51,7 +51,6 @@ m_f0_params.f0min = 80.0; m_f0_params.num_octs = 4; m_f0_params.num_f0s_per_oct = 192; - m_f0_params.num_f0_hyps = 5; m_f0_params.prefer = true; m_f0_params.prefer_mean = 60; m_f0_params.prefer_stdev = 18; @@ -329,18 +328,6 @@ num_octs.quantizeStep = 1.0; list.push_back(num_octs); - ParameterDescriptor num_f0_hyps; - num_f0_hyps.identifier = "num_f0_hyps"; - num_f0_hyps.name = "number of f0 hypotesis"; - num_f0_hyps.description = "Number of f0 hypotesis to extract."; - num_f0_hyps.unit = ""; - num_f0_hyps.minValue = 1; - num_f0_hyps.maxValue = 100; - num_f0_hyps.defaultValue = 10; - num_f0_hyps.isQuantized = true; - num_f0_hyps.quantizeStep = 1.0; - list.push_back(num_f0_hyps); - ParameterDescriptor f0s_per_oct; f0s_per_oct.identifier = "f0s_per_oct"; f0s_per_oct.name = "f0 values per octave"; @@ -425,8 +412,6 @@ return m_f0_params.num_octs; } else if (identifier == "f0s_per_oct") { return m_f0_params.num_f0s_per_oct; - } else if (identifier == "num_f0_hyps") { - return m_f0_params.num_f0_hyps; } else if (identifier == "f0_prefer_fun") { return m_f0_params.prefer ? 1.0 : 0.0; } else if (identifier == "f0_prefer_mean") { @@ -461,8 +446,6 @@ m_f0_params.num_octs = value; } else if (identifier == "f0s_per_oct") { m_f0_params.num_f0s_per_oct = value; - } else if (identifier == "num_f0_hyps") { - m_f0_params.num_f0_hyps = value; } else if (identifier == "f0_prefer_fun") { m_f0_params.prefer = (value > 0.5); } else if (identifier == "f0_prefer_mean") { diff -r a1879532385e -r 2c54d83a196f FChTransformF0gram.h --- a/FChTransformF0gram.h Thu Oct 04 14:56:41 2018 +0100 +++ b/FChTransformF0gram.h Thu Oct 04 14:57:21 2018 +0100 @@ -109,7 +109,6 @@ double f0min; // minimun fundamental frequency int num_octs; // number of octaves int num_f0s_per_oct; // number of f0s per octave - int num_f0_hyps; // number of f0 hypotesis to extract bool prefer; // whether to use a f0 preference guassian function int prefer_mean; // mean of f0 preference function (MIDI number for C4) int prefer_stdev; // stdev of f0 preference function (stdev in MIDI numbers)