Skip to content

Commit

Permalink
dropped SGVector reference
Browse files Browse the repository at this point in the history
  • Loading branch information
hushell authored and hushell committed May 6, 2013
1 parent 2bb00e1 commit a3faafe
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
8 changes: 4 additions & 4 deletions src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp
View file
Expand Up @@ -140,7 +140,7 @@ int32_t CMulticlassOneVsOneStrategy::decide_label(SGVector<float64_t> outputs)
return i_max;
}

void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector<float64_t>& outputs)
void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector<float64_t> outputs)
{
if (m_num_machines < 1)
return;
Expand Down Expand Up @@ -181,7 +181,7 @@ void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector<float64_t>& outputs)
}
}

void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector<float64_t>& outputs,
void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2)
{
if (m_num_machines != outputs.vlen)
Expand Down Expand Up @@ -213,7 +213,7 @@ void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector<float64_t>& outp
outputs[i] = new_outputs[i] / norm;
}

void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector<float64_t>& outputs,
void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2)
{
if (m_num_machines != outputs.vlen)
Expand Down Expand Up @@ -289,7 +289,7 @@ void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector<float64_t>& out
outputs[i] = new_outputs[i];
}

void CMulticlassOneVsOneStrategy::rescale_heuris_hamamura(SGVector<float64_t>& outputs,
void CMulticlassOneVsOneStrategy::rescale_heuris_hamamura(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2)
{
if (m_num_machines != outputs.vlen)
Expand Down
8 changes: 4 additions & 4 deletions src/shogun/multiclass/MulticlassOneVsOneStrategy.h
View file
Expand Up @@ -72,7 +72,7 @@ class CMulticlassOneVsOneStrategy: public CMulticlassStrategy
* @param outputs a vector of output from each machine (in that order)
* which will be resized to length of num_classes if heuristic is set
*/
virtual void rescale_outputs(SGVector<float64_t>& outputs);
virtual void rescale_outputs(SGVector<float64_t> outputs);

/** set the number of classes, since the number of machines totally
* depends on the number of classes, which will also be set.
Expand All @@ -90,23 +90,23 @@ class CMulticlassOneVsOneStrategy: public CMulticlassStrategy
* @param indx1 indices of 1st involved class of training machines
* @param indx2 indices of 2nd involved class of training machines
*/
void rescale_heuris_price(SGVector<float64_t>& outputs,
void rescale_heuris_price(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2);

/** OVO Hastie's heuristic see [1]
* @param outputs a vector of output from each machine (in that order)
* @param indx1 indices of 1st involved class of training machines
* @param indx2 indices of 2nd involved class of training machines
*/
void rescale_heuris_hastie(SGVector<float64_t>& outputs,
void rescale_heuris_hastie(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2);

/** OVO Hamamura's heuristic see [1]
* @param outputs a vector of output from each machine (in that order)
* @param indx1 indices of 1st involved class of training machines
* @param indx2 indices of 2nd involved class of training machines
*/
void rescale_heuris_hamamura(SGVector<float64_t>& outputs,
void rescale_heuris_hamamura(SGVector<float64_t> outputs,
const SGVector<int32_t> indx1, const SGVector<int32_t> indx2);

private:
Expand Down
8 changes: 4 additions & 4 deletions src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp
View file
Expand Up @@ -67,7 +67,7 @@ SGVector<index_t> CMulticlassOneVsRestStrategy::decide_label_multiple_output(SGV
return result;
}

void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t>& outputs)
void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t> outputs)
{
switch(get_prob_heuris_type())
{
Expand All @@ -85,7 +85,7 @@ void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t>& outputs)
}
}

void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t>& outputs,
void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t> outputs,
const SGVector<float64_t> As, const SGVector<float64_t> Bs)
{
if (get_prob_heuris_type()==OVA_SOFTMAX)
Expand All @@ -94,7 +94,7 @@ void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector<float64_t>& outputs,
rescale_outputs(outputs);
}

void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector<float64_t>& outputs)
void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector<float64_t> outputs)
{
if (m_num_classes != outputs.vlen)
{
Expand All @@ -108,7 +108,7 @@ void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector<float64_t>& outp
outputs[i] /= norm;
}

void CMulticlassOneVsRestStrategy::rescale_heuris_softmax(SGVector<float64_t>& outputs,
void CMulticlassOneVsRestStrategy::rescale_heuris_softmax(SGVector<float64_t> outputs,
const SGVector<float64_t> As, const SGVector<float64_t> Bs)
{
if (m_num_classes != outputs.vlen)
Expand Down
8 changes: 4 additions & 4 deletions src/shogun/multiclass/MulticlassOneVsRestStrategy.h
View file
Expand Up @@ -86,27 +86,27 @@ class CMulticlassOneVsRestStrategy: public CMulticlassStrategy
/** rescale multiclass outputs according to the selected heuristic
* @param outputs a vector of output from each machine (in that order)
*/
virtual void rescale_outputs(SGVector<float64_t>& outputs);
virtual void rescale_outputs(SGVector<float64_t> outputs);

/** rescale multiclass outputs according to the selected heuristic
* this function only being called with OVA_SOFTMAX heuristic
* @param outputs a vector of output from each machine (in that order)
* @param sig_params a vector of sigmoid parameters w.r.t binary machines
*/
virtual void rescale_outputs(SGVector<float64_t>& outputs,
virtual void rescale_outputs(SGVector<float64_t> outputs,
const SGVector<float64_t> As, const SGVector<float64_t> Bs);

protected:
/** OVA normalization heuristic
* @param outputs a vector of output from each machine (in that order)
*/
void rescale_heuris_norm(SGVector<float64_t>& outputs);
void rescale_heuris_norm(SGVector<float64_t> outputs);

/** OVA softmax heuristic
* @param outputs a vector of output from each machine (in that order)
* @param sig_params a vector of sigmoid parameters w.r.t binary machines
*/
void rescale_heuris_softmax(SGVector<float64_t>& outputs,
void rescale_heuris_softmax(SGVector<float64_t> outputs,
const SGVector<float64_t> As, const SGVector<float64_t> Bs);

};
Expand Down
4 changes: 2 additions & 2 deletions src/shogun/multiclass/MulticlassStrategy.h
View file
Expand Up @@ -141,7 +141,7 @@ class CMulticlassStrategy: public CSGObject
/** rescale multiclass outputs according to the selected heuristic
* @param outputs a vector of output from each machine (in that order)
*/
virtual void rescale_outputs(SGVector<float64_t>& outputs)
virtual void rescale_outputs(SGVector<float64_t> outputs)
{
}

Expand All @@ -150,7 +150,7 @@ class CMulticlassStrategy: public CSGObject
* @param outputs a vector of output from each machine (in that order)
* @param sig_params a vector of sigmoid parameters w.r.t binary machines
*/
virtual void rescale_outputs(SGVector<float64_t>& outputs,
virtual void rescale_outputs(SGVector<float64_t> outputs,
const SGVector<float64_t> As, const SGVector<float64_t> Bs)
{
}
Expand Down

0 comments on commit a3faafe

Please sign in to comment.