copy some virtual function calls to director kernel to fix some errors

shogun-toolbox · Mar 26, 2012 · e6d427d · e6d427d
1 parent 0f26327
commit e6d427d
Showing 1 changed file with 151 additions and 0 deletions.
diff --git a/src/shogun/kernel/DirectorKernel.h b/src/shogun/kernel/DirectorKernel.h
@@ -12,6 +12,7 @@
 #define _DIRECTORKERNEL_H___
 
 #include <shogun/lib/common.h>
+#include <shogun/lib/DataType.h>
 #include <shogun/kernel/Kernel.h>
 
 namespace shogun
@@ -81,7 +82,152 @@ class CDirectorKernel: public CKernel
 		 */
 		inline virtual const char* get_name() const { return "DirectorKernel"; }
 
+		/** get subkernel weights
+		 *
+		 * @param num_weights number of weights will be stored here
+		 * @return subkernel weights
+		 */
+		virtual const float64_t* get_subkernel_weights(int32_t& num_weights)
+		{
+			return CKernel::get_subkernel_weights(num_weights);
+		}
+
+		/** set subkernel weights
+		 *
+		 * @param weights new subkernel weights
+		 */
+		virtual void set_subkernel_weights(SGVector<float64_t> weights)
+		{
+			CKernel::set_subkernel_weights(weights);
+		}
+
+		/**
+		 * get row i
+		 *
+		 * @return the ith row of the kernel matrix
+		 */
+		virtual SGVector<float64_t> get_kernel_row(int32_t i)
+		{
+			return CKernel::get_kernel_row(i);
+		}
+
+		/**
+		 * get column j
+		 *
+		 * @return the jth column of the kernel matrix
+		 */
+		virtual SGVector<float64_t> get_kernel_col(int32_t j)
+        {
+			return CKernel::get_kernel_col(j);
+        }
+
 	protected:
+		/** creates a new TParameter instance, which contains migrated data from
+		 * the version that is provided. The provided parameter data base is used
+		 * for migration, this base is a collection of all parameter data of the
+		 * previous version.
+		 * Migration is done FROM the data in param_base TO the provided param info
+		 * Migration is always one version step.
+		 * Method has to be implemented in subclasses, if no match is found, base
+		 * method has to be called.
+		 *
+		 * If there is an element in the param_base which equals the target,
+		 * a copy of the element is returned. This represents the case when nothing
+		 * has changed and therefore, the migrate method is not overloaded in a
+		 * subclass
+		 *
+		 * @param param_base set of TParameter instances to use for migration
+		 * @param target parameter info for the resulting TParameter
+		 * @return a new TParameter instance with migrated data from the base of the
+		 * type which is specified by the target parameter
+		 */
+		virtual TParameter* migrate(DynArray<TParameter*>* param_base,
+				const SGParamInfo* target)
+		{
+			return CSGObject::migrate(param_base, target);
+		}
+
+		/** This method prepares everything for a one-to-one parameter migration.
+		 * One to one here means that only ONE element of the parameter base is
+		 * needed for the migration (the one with the same name as the target).
+		 * Data is allocated for the target (in the type as provided in the target
+		 * SGParamInfo), and a corresponding new TParameter instance is written to
+		 * replacement. The to_migrate pointer points to the single needed
+		 * TParameter instance needed for migration.
+		 * If a name change happened, the old name may be specified by old_name.
+		 * In addition, the m_delete_data flag of to_migrate is set to true.
+		 * So if you want to migrate data, the only thing to do after this call is
+		 * converting the data in the m_parameter fields.
+		 * If unsure how to use - have a look into an example for this.
+		 * (base_migration_type_conversion.cpp for example)
+		 *
+		 * @param param_base set of TParameter instances to use for migration
+		 * @param target parameter info for the resulting TParameter
+		 * @param replacement (used as output) here the TParameter instance which is
+		 * returned by migration is created into
+		 * @param to_migrate the only source that is used for migration
+		 * @param old_name with this parameter, a name change may be specified
+		 *
+		 */
+		virtual void one_to_one_migration_prepare(DynArray<TParameter*>* param_base,
+				const SGParamInfo* target, TParameter*& replacement,
+				TParameter*& to_migrate, char* old_name=NULL)
+		{
+			return CSGObject::one_to_one_migration_prepare(param_base, target,
+					replacement, to_migrate, old_name);
+		}
+		/** Can (optionally) be overridden to pre-initialize some member
+		 *  variables which are not PARAMETER::ADD'ed.  Make sure that at
+		 *  first the overridden method BASE_CLASS::LOAD_SERIALIZABLE_PRE
+		 *  is called.
+		 *
+		 *  @exception ShogunException Will be thrown if an error
+		 *                             occurres.
+		 */
+		virtual void load_serializable_pre() throw (ShogunException)
+		{
+			CKernel::load_serializable_pre();
+		}
+
+		/** Can (optionally) be overridden to post-initialize some member
+		 *  variables which are not PARAMETER::ADD'ed.  Make sure that at
+		 *  first the overridden method BASE_CLASS::LOAD_SERIALIZABLE_POST
+		 *  is called.
+		 *
+		 *  @exception ShogunException Will be thrown if an error
+		 *                             occurres.
+		 */
+		virtual void load_serializable_post() throw (ShogunException)
+		{
+			CKernel::load_serializable_post();
+		}
+
+		/** Can (optionally) be overridden to pre-initialize some member
+		 *  variables which are not PARAMETER::ADD'ed.  Make sure that at
+		 *  first the overridden method BASE_CLASS::SAVE_SERIALIZABLE_PRE
+		 *  is called.
+		 *
+		 *  @exception ShogunException Will be thrown if an error
+		 *                             occurres.
+		 */
+		virtual void save_serializable_pre() throw (ShogunException)
+		{
+			CKernel::save_serializable_pre();
+		}
+
+		/** Can (optionally) be overridden to post-initialize some member
+		 *  variables which are not PARAMETER::ADD'ed.  Make sure that at
+		 *  first the overridden method BASE_CLASS::SAVE_SERIALIZABLE_POST
+		 *  is called.
+		 *
+		 *  @exception ShogunException Will be thrown if an error
+		 *                             occurres.
+		 */
+		virtual void save_serializable_post() throw (ShogunException)
+		{
+			CKernel::save_serializable_post();
+		}
+
 		/** compute kernel function for features a and b
 		 * idx_{a,b} denote the index of the feature vectors
 		 * in the corresponding feature object
@@ -95,6 +241,11 @@ class CDirectorKernel: public CKernel
 			SG_ERROR("Compute method of Director Kernel needs to be overridden.\n");
 			return 0;
 		}
+
+		virtual void register_params()
+		{
+			CKernel::register_params();
+		}
 };
 }
 #endif /* _GAUSSIANKERNEL_H__ */