From a3faafeb2fc5110288fa68c39c775b5218be3484 Mon Sep 17 00:00:00 2001 From: hushell Date: Sun, 5 May 2013 17:56:16 -0700 Subject: [PATCH] dropped SGVector reference --- src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp | 8 ++++---- src/shogun/multiclass/MulticlassOneVsOneStrategy.h | 8 ++++---- src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp | 8 ++++---- src/shogun/multiclass/MulticlassOneVsRestStrategy.h | 8 ++++---- src/shogun/multiclass/MulticlassStrategy.h | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp b/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp index 7ea8c0c41a1..fab6ce82d25 100644 --- a/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp +++ b/src/shogun/multiclass/MulticlassOneVsOneStrategy.cpp @@ -140,7 +140,7 @@ int32_t CMulticlassOneVsOneStrategy::decide_label(SGVector outputs) return i_max; } -void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector& outputs) +void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector outputs) { if (m_num_machines < 1) return; @@ -181,7 +181,7 @@ void CMulticlassOneVsOneStrategy::rescale_outputs(SGVector& outputs) } } -void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector& outputs, +void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector outputs, const SGVector indx1, const SGVector indx2) { if (m_num_machines != outputs.vlen) @@ -213,7 +213,7 @@ void CMulticlassOneVsOneStrategy::rescale_heuris_price(SGVector& outp outputs[i] = new_outputs[i] / norm; } -void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector& outputs, +void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector outputs, const SGVector indx1, const SGVector indx2) { if (m_num_machines != outputs.vlen) @@ -289,7 +289,7 @@ void CMulticlassOneVsOneStrategy::rescale_heuris_hastie(SGVector& out outputs[i] = new_outputs[i]; } -void CMulticlassOneVsOneStrategy::rescale_heuris_hamamura(SGVector& outputs, +void CMulticlassOneVsOneStrategy::rescale_heuris_hamamura(SGVector outputs, const SGVector indx1, const SGVector indx2) { if (m_num_machines != outputs.vlen) diff --git a/src/shogun/multiclass/MulticlassOneVsOneStrategy.h b/src/shogun/multiclass/MulticlassOneVsOneStrategy.h index dacb5b3408e..a0223355a0c 100644 --- a/src/shogun/multiclass/MulticlassOneVsOneStrategy.h +++ b/src/shogun/multiclass/MulticlassOneVsOneStrategy.h @@ -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& outputs); + virtual void rescale_outputs(SGVector outputs); /** set the number of classes, since the number of machines totally * depends on the number of classes, which will also be set. @@ -90,7 +90,7 @@ 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& outputs, + void rescale_heuris_price(SGVector outputs, const SGVector indx1, const SGVector indx2); /** OVO Hastie's heuristic see [1] @@ -98,7 +98,7 @@ 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_hastie(SGVector& outputs, + void rescale_heuris_hastie(SGVector outputs, const SGVector indx1, const SGVector indx2); /** OVO Hamamura's heuristic see [1] @@ -106,7 +106,7 @@ 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_hamamura(SGVector& outputs, + void rescale_heuris_hamamura(SGVector outputs, const SGVector indx1, const SGVector indx2); private: diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp b/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp index 37083fa7290..dd2392a8eca 100644 --- a/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp +++ b/src/shogun/multiclass/MulticlassOneVsRestStrategy.cpp @@ -67,7 +67,7 @@ SGVector CMulticlassOneVsRestStrategy::decide_label_multiple_output(SGV return result; } -void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector& outputs) +void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector outputs) { switch(get_prob_heuris_type()) { @@ -85,7 +85,7 @@ void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector& outputs) } } -void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector& outputs, +void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector outputs, const SGVector As, const SGVector Bs) { if (get_prob_heuris_type()==OVA_SOFTMAX) @@ -94,7 +94,7 @@ void CMulticlassOneVsRestStrategy::rescale_outputs(SGVector& outputs, rescale_outputs(outputs); } -void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector& outputs) +void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector outputs) { if (m_num_classes != outputs.vlen) { @@ -108,7 +108,7 @@ void CMulticlassOneVsRestStrategy::rescale_heuris_norm(SGVector& outp outputs[i] /= norm; } -void CMulticlassOneVsRestStrategy::rescale_heuris_softmax(SGVector& outputs, +void CMulticlassOneVsRestStrategy::rescale_heuris_softmax(SGVector outputs, const SGVector As, const SGVector Bs) { if (m_num_classes != outputs.vlen) diff --git a/src/shogun/multiclass/MulticlassOneVsRestStrategy.h b/src/shogun/multiclass/MulticlassOneVsRestStrategy.h index 3eb95112a5c..a9561d73dba 100644 --- a/src/shogun/multiclass/MulticlassOneVsRestStrategy.h +++ b/src/shogun/multiclass/MulticlassOneVsRestStrategy.h @@ -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& outputs); + virtual void rescale_outputs(SGVector 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& outputs, + virtual void rescale_outputs(SGVector outputs, const SGVector As, const SGVector Bs); protected: /** OVA normalization heuristic * @param outputs a vector of output from each machine (in that order) */ - void rescale_heuris_norm(SGVector& outputs); + void rescale_heuris_norm(SGVector 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& outputs, + void rescale_heuris_softmax(SGVector outputs, const SGVector As, const SGVector Bs); }; diff --git a/src/shogun/multiclass/MulticlassStrategy.h b/src/shogun/multiclass/MulticlassStrategy.h index 0ce9bc9bddc..657cfeda7e3 100644 --- a/src/shogun/multiclass/MulticlassStrategy.h +++ b/src/shogun/multiclass/MulticlassStrategy.h @@ -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& outputs) + virtual void rescale_outputs(SGVector outputs) { } @@ -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& outputs, + virtual void rescale_outputs(SGVector outputs, const SGVector As, const SGVector Bs) { }