Skip to content

Commit

Permalink
Guarded conflicting method in dense labels
Browse files Browse the repository at this point in the history
  • Loading branch information
lisitsyn committed Feb 25, 2013
1 parent ddd10aa commit 370a2ee
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/shogun/labels/DenseLabels.cpp
Expand Up @@ -119,6 +119,7 @@ void CDenseLabels::set_int_labels(SGVector<int32_t> lab)
set_int_label(i, lab.vector[i]);
}

#ifndef SWIGJAVA
void CDenseLabels::set_int_labels(SGVector<int64_t> lab)
{
if (m_subset_stack->has_subsets())
Expand All @@ -129,6 +130,7 @@ void CDenseLabels::set_int_labels(SGVector<int64_t> lab)
for (int32_t i=0; i<lab.vlen; i++)
set_int_label(i, lab.vector[i]);
}
#endif

void CDenseLabels::ensure_valid(const char* context)
{
Expand Down
2 changes: 2 additions & 0 deletions src/shogun/labels/DenseLabels.h
Expand Up @@ -176,13 +176,15 @@ class CDenseLabels : public CLabels
*/
void set_int_labels(SGVector<int32_t> labels);

#ifndef SWIGJAVA
/** set INT64 labels
*
* not possible on subset
*
* @param labels INT labels
*/
void set_int_labels(SGVector<int64_t> labels);
#endif

/** get number of labels, depending on whether a subset is set
*
Expand Down

0 comments on commit 370a2ee

Please sign in to comment.