Skip to content

Commit

Permalink
Yet another warnings removal
Browse files Browse the repository at this point in the history
  • Loading branch information
lisitsyn committed Aug 20, 2011
1 parent 2ca6531 commit 569d85e
Show file tree
Hide file tree
Showing 19 changed files with 38 additions and 4 deletions.
1 change: 1 addition & 0 deletions src/shogun/base/SGObject.h
Expand Up @@ -62,6 +62,7 @@ class CSerializableFile;
* End of macros for registering parameters/model selection parameters
******************************************************************************/

/** model selection availability */
enum EModelSelectionAvailability {
MS_NOT_AVAILABLE=0, MS_AVAILABLE
};
Expand Down
4 changes: 4 additions & 0 deletions src/shogun/base/class_list.h
Expand Up @@ -16,6 +16,10 @@
namespace shogun {
class CSGObject;

/** new shogun serializable
* @param serializable_name
* @param generic
*/
CSGObject* new_sgserializable(const char* sgserializable_name,
EPrimitiveType generic);
}
Expand Down
1 change: 1 addition & 0 deletions src/shogun/base/init.h
Expand Up @@ -38,6 +38,7 @@ void init_shogun(void (*print_message)(FILE* target, const char* str) = NULL,
void (*print_error)(FILE* target, const char* str) = NULL,
void (*cancel_computations)(bool &delayed, bool &immediately)=NULL);

/** init shogun with defaults */
void init_shogun_with_defaults();

/** This function must be called when one stops using libshogun. It will
Expand Down
1 change: 1 addition & 0 deletions src/shogun/distance/Distance.h
Expand Up @@ -29,6 +29,7 @@ class CFeatures;
enum EFeatureType;
enum EFeatureClass;

/** type of distance */
enum EDistanceType
{
D_UNKNOWN = 0,
Expand Down
1 change: 1 addition & 0 deletions src/shogun/evaluation/ContingencyTableEvaluation.h
Expand Up @@ -21,6 +21,7 @@ namespace shogun

class CLabels;

/** type of measure */
enum EContingencyTableMeasureType
{
ACCURACY = 0,
Expand Down
1 change: 1 addition & 0 deletions src/shogun/io/SGIO.h
Expand Up @@ -28,6 +28,7 @@
namespace shogun
{
class SGIO;
/** shogun IO */
extern SGIO* sg_io;
}

Expand Down
6 changes: 3 additions & 3 deletions src/shogun/kernel/BesselKernel.h
Expand Up @@ -25,9 +25,9 @@ class CDistance;
* k(x, y) = \frac{J_{v}( \| x-y \|/\tau)}{ \| x-y \| ^ {-nv} }
* \f]
* Where:
* J_{v} is the Bessel funcion with order v,
* \tau is the kernel width, and
* n is the kernel degree.
* \f$J_{v}\f$ is the Bessel funcion with order \f$v\f$,
* \f$\tau\f$ is the kernel width, and
* \f$n\f$ is the kernel degree.
* */
class CBesselKernel: public CDistanceKernel
{
Expand Down
1 change: 1 addition & 0 deletions src/shogun/kernel/Kernel.h
Expand Up @@ -113,6 +113,7 @@ enum EKernelType
K_BESSEL = 460,
};

/** kernel property */
enum EKernelProperty
{
KP_NONE = 0,
Expand Down
7 changes: 6 additions & 1 deletion src/shogun/kernel/WaveletKernel.h
Expand Up @@ -20,11 +20,16 @@ namespace shogun
/** the class WaveletKernel
*
* It is defined as
*
* \f[
* k({\bf x},({\bf x'})= \prod_{i=0}^{l}h(\frac{(x-c)}{a})\cdot h(\frac{(x'-c)}{a})
* \f]
* Where h(x) is the mother wavelet function
*
* Where \f$h(x)\f$ is the mother wavelet function
*
* \f[
* h({\bf x}=cos(1.75*x)\cdot exp(\frac{(-x^2){2})
* \f]
*
*/
class CWaveletKernel: public CDotKernel
Expand Down
1 change: 1 addition & 0 deletions src/shogun/kernel/WeightedDegreeStringKernel.h
Expand Up @@ -21,6 +21,7 @@
namespace shogun
{

/** WD kernel type */
enum EWDKernType
{
E_WD=0,
Expand Down
1 change: 1 addition & 0 deletions src/shogun/lib/Compressor.h
Expand Up @@ -22,6 +22,7 @@

namespace shogun
{
/** compression type */
enum E_COMPRESSION_TYPE
{
UNCOMPRESSED,
Expand Down
1 change: 1 addition & 0 deletions src/shogun/lib/DataType.h
Expand Up @@ -21,6 +21,7 @@ namespace shogun

template<class T> class CCache;

/** index */
typedef int32_t index_t;

/** shogun vector */
Expand Down
1 change: 1 addition & 0 deletions src/shogun/modelselection/ModelSelectionParameters.h
Expand Up @@ -19,6 +19,7 @@ namespace shogun

class CParameterCombination;

/** type of range */
enum ERangeType
{
R_LINEAR, R_EXP, R_LOG
Expand Down
1 change: 1 addition & 0 deletions src/shogun/regression/Regression.h
Expand Up @@ -13,6 +13,7 @@

namespace shogun
{
/// type of regressor
enum ERegressionType
{
RT_NONE = 0,
Expand Down
1 change: 1 addition & 0 deletions src/shogun/ui/GUIClassifier.h
Expand Up @@ -20,6 +20,7 @@ namespace shogun
{
class CSGInterface;

/** gui classifier */
class CGUIClassifier : public CSGObject
{
public:
Expand Down
1 change: 1 addition & 0 deletions src/shogun/ui/GUIHMM.h
Expand Up @@ -21,6 +21,7 @@ namespace shogun
{
class CSGInterface;

/** gui HMM */
class CGUIHMM : public CSGObject
{
public:
Expand Down
1 change: 1 addition & 0 deletions src/shogun/ui/GUIMath.h
Expand Up @@ -18,6 +18,7 @@ namespace shogun
{
class CSGInterface;

/** gui math */
class CGUIMath : public CSGObject
{
public:
Expand Down
1 change: 1 addition & 0 deletions src/shogun/ui/GUITime.h
Expand Up @@ -19,6 +19,7 @@ namespace shogun
{
class CSGInterface;

/** gui time */
class CGUITime : public CSGObject
{
public:
Expand Down
10 changes: 10 additions & 0 deletions src/shogun/ui/SGInterface.h
Expand Up @@ -32,6 +32,7 @@ namespace shogun
*/
enum IFType
{
/// undefined
UNDEFINED,

///simple scalar/string types
Expand Down Expand Up @@ -86,16 +87,24 @@ enum IFType
ATTR_STRUCT
};

/** objective enumerate */
enum E_WHICH_OBJ
{
/// svm primal task
SVM_PRIMAL,
/// svm dual task
SVM_DUAL,
/// mkl primal task
MKL_PRIMAL,
/// mkl dual task
MKL_DUAL,
/// mkl relative duality gap
MKL_RELATIVE_DUALITY_GAP,
/// mkl absolute duality gap
MKL_ABSOLUTE_DUALITY_GAP
};

/** shogun interface */
class CSGInterface : public CSGObject
{
public:
Expand Down Expand Up @@ -1111,6 +1120,7 @@ class CSGInterface : public CSGObject
char* m_legacy_strptr;
};

/** sg interface ptr typedef */
typedef bool (CSGInterface::*CSGInterfacePtr)();

typedef struct {
Expand Down

0 comments on commit 569d85e

Please sign in to comment.