Skip to content

Commit b51e2b1

Browse files
avramidisavramidis
committed
Removed some uses of m_model_selection_parameters
1 parent d751f66 commit b51e2b1

File tree

9 files changed

+1
-142
lines changed

9 files changed

+1
-142
lines changed

‎examples/undocumented/libshogun/parameter_modsel_parameters.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ void print_message(FILE* target, const char* str)
2323

2424
void print_modsel_parameters(CSGObject* object)
2525
{
26-
SGStringList<char> modsel_params=object->get_modelsel_names();
27-
2826
SG_SPRINT("Parameters of %s available for model selection:\n",
2927
object->get_name());
3028

@@ -34,8 +32,6 @@ void print_modsel_parameters(CSGObject* object)
3432
/* extract current name, ddescription and type, and print them */
3533
const char* name=modsel_params.strings[i].string;
3634
index_t index=object->get_modsel_param_index(name);
37-
TSGDataType type=object->m_model_selection_parameters->get_parameter(
38-
index)->m_datatype;
3935
type.to_string(type_string, 100);
4036
SG_SPRINT("\"%s\": \"%s\", %s\n", name,
4137
object->get_modsel_param_descr(name), type_string);

‎src/shogun/base/SGObject.cpp

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ CSGObject::~CSGObject()
204204

205205
unset_global_objects();
206206
delete m_parameters;
207-
delete m_model_selection_parameters;
208207
delete m_gradient_parameters;
209208
delete m_refcount;
210209
delete m_subject_params;
@@ -520,7 +519,6 @@ void CSGObject::init()
520519
parallel = NULL;
521520
version = NULL;
522521
m_parameters = new Parameter();
523-
m_model_selection_parameters = new Parameter();
524522
m_gradient_parameters=new Parameter();
525523
m_generic = PT_NOT_GENERIC;
526524
m_load_pre_called = false;
@@ -534,88 +532,6 @@ void CSGObject::init()
534532
m_subscriber_params = new SGSubscriber(m_subject_params->get_subscriber());
535533
}
536534

537-
void CSGObject::print_modsel_params()
538-
{
539-
SG_PRINT("parameters available for model selection for %s:\n", get_name())
540-
541-
index_t num_param=m_model_selection_parameters->get_num_parameters();
542-
543-
if (!num_param)
544-
SG_PRINT("\tnone\n")
545-
546-
for (index_t i=0; i<num_param; i++)
547-
{
548-
TParameter* current=m_model_selection_parameters->get_parameter(i);
549-
index_t l=200;
550-
char* type=SG_MALLOC(char, l);
551-
if (type)
552-
{
553-
current->m_datatype.to_string(type, l);
554-
SG_PRINT("\t%s (%s): %s\n", current->m_name, current->m_description,
555-
type);
556-
SG_FREE(type);
557-
}
558-
}
559-
}
560-
561-
SGStringList<char> CSGObject::get_modelsel_names()
562-
{
563-
index_t num_param=m_model_selection_parameters->get_num_parameters();
564-
565-
SGStringList<char> result(num_param, -1);
566-
567-
index_t max_string_length=-1;
568-
569-
for (index_t i=0; i<num_param; i++)
570-
{
571-
char* name=m_model_selection_parameters->get_parameter(i)->m_name;
572-
index_t len=strlen(name);
573-
// +1 to have a zero terminated string
574-
result.strings[i]=SGString<char>(name, len+1);
575-
576-
if (len>max_string_length)
577-
max_string_length=len;
578-
}
579-
580-
result.max_string_length=max_string_length;
581-
582-
return result;
583-
}
584-
585-
char* CSGObject::get_modsel_param_descr(const char* param_name)
586-
{
587-
index_t index=get_modsel_param_index(param_name);
588-
589-
if (index<0)
590-
{
591-
SG_ERROR("There is no model selection parameter called \"%s\" for %s",
592-
param_name, get_name());
593-
}
594-
595-
return m_model_selection_parameters->get_parameter(index)->m_description;
596-
}
597-
598-
index_t CSGObject::get_modsel_param_index(const char* param_name)
599-
{
600-
/* use fact that names extracted from below method are in same order than
601-
* in m_model_selection_parameters variable */
602-
SGStringList<char> names=get_modelsel_names();
603-
604-
/* search for parameter with provided name */
605-
index_t index=-1;
606-
for (index_t i=0; i<names.num_strings; i++)
607-
{
608-
TParameter* current=m_model_selection_parameters->get_parameter(i);
609-
if (!strcmp(param_name, current->m_name))
610-
{
611-
index=i;
612-
break;
613-
}
614-
}
615-
616-
return index;
617-
}
618-
619535
void CSGObject::get_parameter_incremental_hash(uint32_t& hash, uint32_t& carry,
620536
uint32_t& total_length)
621537
{
@@ -657,27 +573,6 @@ void CSGObject::get_parameter_incremental_hash(uint32_t& hash, uint32_t& carry,
657573
}
658574
}
659575

660-
void CSGObject::build_gradient_parameter_dictionary(CMap<TParameter*, CSGObject*>* dict)
661-
{
662-
for (index_t i=0; i<m_gradient_parameters->get_num_parameters(); i++)
663-
{
664-
TParameter* p=m_gradient_parameters->get_parameter(i);
665-
dict->add(p, this);
666-
}
667-
668-
for (index_t i=0; i<m_model_selection_parameters->get_num_parameters(); i++)
669-
{
670-
TParameter* p=m_model_selection_parameters->get_parameter(i);
671-
CSGObject* child=*(CSGObject**)(p->m_parameter);
672-
673-
if ((p->m_datatype.m_ptype == PT_SGOBJECT) &&
674-
(p->m_datatype.m_ctype == CT_SCALAR) && child)
675-
{
676-
child->build_gradient_parameter_dictionary(dict);
677-
}
678-
}
679-
}
680-
681576
CSGObject* CSGObject::clone()
682577
{
683578
SG_DEBUG("Starting to clone %s at %p.\n", get_name(), this);

‎src/shogun/base/SGObject.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ template <class T> class SGStringList;
9292
AnyParameterProperties(description, param_properties); \
9393
this->m_parameters->add(param, name, description); \
9494
this->watch_param(name, param, pprop); \
95-
if (pprop.get_model_selection()) \
96-
this->m_model_selection_parameters->add(param, name, description); \
9795
if (pprop.get_gradient()) \
9896
this->m_gradient_parameters->add(param, name, description); \
9997
}
@@ -878,9 +876,6 @@ class CSGObject
878876
/** parameters */
879877
Parameter* m_parameters;
880878

881-
/** model selection parameters */
882-
Parameter* m_model_selection_parameters;
883-
884879
/** parameters wrt which we can compute gradients */
885880
Parameter* m_gradient_parameters;
886881

‎src/shogun/lib/List.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ class CList : public CSGObject
8787
"Number of elements.");
8888
m_parameters->add((CSGObject**) &first, "first",
8989
"First element in list.");
90-
m_model_selection_parameters->add((CSGObject**) &first, "first",
91-
"First element in list.");
9290

9391
first = NULL;
9492
current = NULL;

‎src/shogun/modelselection/GridSearchModelSelection.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,6 @@ CParameterCombination* CGridSearchModelSelection::select_model(bool print_state)
6868
current_combination->print_tree();
6969
}
7070

71-
current_combination->apply_to_modsel_parameter(
72-
machine->m_model_selection_parameters);
73-
7471
/* note that this may implicitly lock and unlockthe machine */
7572
CCrossValidationResult* result=
7673
(CCrossValidationResult*)(m_machine_eval->evaluate());

‎src/shogun/modelselection/ParameterCombination.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ CParameterCombination::CParameterCombination(CSGObject* obj)
8181
}
8282
}
8383

84-
Parameter* modsel_params=obj->m_model_selection_parameters;
85-
8684
for (index_t i=0; i<modsel_params->get_num_parameters(); i++)
8785
{
8886
TParameter* param=modsel_params->get_parameter(i);
@@ -700,7 +698,7 @@ CParameterCombination* CParameterCombination::copy_tree() const
700698

701699
void CParameterCombination::apply_to_machine(CMachine* machine) const
702700
{
703-
apply_to_modsel_parameter(machine->m_model_selection_parameters);
701+
704702
}
705703

706704
void CParameterCombination::apply_to_modsel_parameter(
@@ -749,8 +747,6 @@ void CParameterCombination::apply_to_modsel_parameter(
749747
{
750748
CParameterCombination* child=(CParameterCombination*)
751749
m_child_nodes->get_element(i);
752-
child->apply_to_modsel_parameter(
753-
current_sgobject->m_model_selection_parameters);
754750
SG_UNREF(child);
755751
}
756752
}

‎src/shogun/modelselection/RandomSearchModelSelection.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ CParameterCombination* CRandomSearchModelSelection::select_model(bool print_stat
7979
current_combination->print_tree();
8080
}
8181

82-
current_combination->apply_to_modsel_parameter(
83-
machine->m_model_selection_parameters);
84-
8582
/* note that this may implicitly lock and unlockthe machine */
8683
CCrossValidationResult* result =
8784
(CCrossValidationResult*)(m_machine_eval->evaluate());

‎tests/unit/machine/gp/GaussianLikelihood_unittest.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ TEST(GaussianLikelihood,get_first_derivative)
268268
// Gaussian likelihood with sigma = 0.13
269269
CGaussianLikelihood* likelihood=new CGaussianLikelihood(0.13);
270270

271-
TParameter* param=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
272-
273271
SGVector<float64_t> lp_dhyp=likelihood->get_first_derivative(labels, func,
274272
param);
275273

@@ -313,8 +311,6 @@ TEST(GaussianLikelihood,get_second_derivative)
313311
// Gaussian likelihood with sigma = 0.13
314312
CGaussianLikelihood* likelihood=new CGaussianLikelihood(0.13);
315313

316-
TParameter* param=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
317-
318314
SGVector<float64_t> dlp_dhyp=likelihood->get_second_derivative(labels, func,
319315
param);
320316

@@ -358,8 +354,6 @@ TEST(GaussianLikelihood,get_third_derivative)
358354
// Gaussian likelihood with sigma = 0.13
359355
CGaussianLikelihood* likelihood=new CGaussianLikelihood(0.13);
360356

361-
TParameter* param=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
362-
363357
SGVector<float64_t> d2lp_dhyp=likelihood->get_third_derivative(labels, func,
364358
param);
365359

‎tests/unit/machine/gp/StudentsTLikelihood_unittest.cc

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,6 @@ TEST(StudentsTLikelihood,get_first_derivative)
270270
// Stundent's-t likelihood with sigma = 0.17, df = 3
271271
CStudentsTLikelihood* likelihood=new CStudentsTLikelihood(0.17, 3);
272272

273-
TParameter* param1=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
274-
TParameter* param2=likelihood->m_model_selection_parameters->get_parameter("log_df");
275-
276273
SGVector<float64_t> lp_dhyp1=likelihood->get_first_derivative(labels, func,
277274
param1);
278275
SGVector<float64_t> lp_dhyp2=likelihood->get_first_derivative(labels, func,
@@ -324,9 +321,6 @@ TEST(StudentsTLikelihood,get_second_derivative)
324321
// Stundent's-t likelihood with sigma = 0.17, df = 3
325322
CStudentsTLikelihood* likelihood=new CStudentsTLikelihood(0.17, 3);
326323

327-
TParameter* param1=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
328-
TParameter* param2=likelihood->m_model_selection_parameters->get_parameter("log_df");
329-
330324
SGVector<float64_t> dlp_dhyp1=likelihood->get_second_derivative(labels,
331325
func, param1);
332326
SGVector<float64_t> dlp_dhyp2=likelihood->get_second_derivative(labels,
@@ -378,9 +372,6 @@ TEST(StudentsTLikelihood,get_third_derivative)
378372
// Stundent's-t likelihood with sigma = 0.17, df = 3
379373
CStudentsTLikelihood* likelihood=new CStudentsTLikelihood(0.17, 3);
380374

381-
TParameter* param1=likelihood->m_model_selection_parameters->get_parameter("log_sigma");
382-
TParameter* param2=likelihood->m_model_selection_parameters->get_parameter("log_df");
383-
384375
SGVector<float64_t> d2lp_dhyp1=likelihood->get_third_derivative(labels,
385376
func, param1);
386377
SGVector<float64_t> d2lp_dhyp2=likelihood->get_third_derivative(labels,

0 commit comments

Comments
 (0)