Skip to content

Commit

Permalink
fixed some ultra subtle bugs that broke clone/equals
Browse files Browse the repository at this point in the history
  • Loading branch information
karlnapf committed Jul 18, 2013
1 parent 783aa89 commit 8a9fd52
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/shogun/evaluation/CrossValidation.cpp
Expand Up @@ -20,7 +20,7 @@

using namespace shogun;

CCrossValidation::CCrossValidation()
CCrossValidation::CCrossValidation() : CMachineEvaluation()
{
init();
}
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/evaluation/MachineEvaluation.cpp
Expand Up @@ -93,10 +93,10 @@ void CMachineEvaluation::init()
"Used splitting strategy", MS_NOT_AVAILABLE);
SG_ADD((CSGObject**)&m_evaluation_criterion, "evaluation_criterion",
"Used evaluation criterion", MS_NOT_AVAILABLE);
SG_ADD((CSGObject**)&m_do_unlock, "do_unlock",
SG_ADD(&m_do_unlock, "do_unlock",
"Whether machine should be unlocked after evaluation",
MS_NOT_AVAILABLE);
SG_ADD((CSGObject**)&m_autolock, "m_autolock",
SG_ADD(&m_autolock, "m_autolock",
"Whether machine should automatically try to be locked before ",
MS_NOT_AVAILABLE);

Expand Down
4 changes: 2 additions & 2 deletions src/shogun/evaluation/SplittingStrategy.cpp
Expand Up @@ -60,8 +60,8 @@ void CSplittingStrategy::init()
m_is_filled=false;
m_num_subsets=0;

m_parameters->add((CSGObject**)m_labels, "labels", "Labels for subsets");
m_parameters->add((CSGObject**)m_subset_indices, "subset_indices",
m_parameters->add((CSGObject**)&m_labels, "labels", "Labels for subsets");
m_parameters->add((CSGObject**)&m_subset_indices, "subset_indices",
"Set of sets of subset indices");
m_parameters->add(&m_is_filled, "is_filled", "Whether ther are index sets");
m_parameters->add(&m_num_subsets, "num_subsets", "Number of index sets");
Expand Down
Expand Up @@ -16,7 +16,7 @@
using namespace shogun;

CStratifiedCrossValidationSplitting::CStratifiedCrossValidationSplitting() :
CSplittingStrategy(0, 0)
CSplittingStrategy()
{
}

Expand Down

0 comments on commit 8a9fd52

Please sign in to comment.