rename msvmmaj to gensvm

22 files changed, 258 insertions, 258 deletions

diff --git a/include/crossval.h b/include/crossval.h
index 0dff0b9..fa3cca7 100644
--- a/include/crossval.h
+++ b/include/crossval.h
@@ -6,20 +6,20 @@
  *
  * @details
  * Contains function declarations for functions needed for performing cross
- * validation on MajData structures.
+ * validation on GenData structures.
  *
  */
 
-#ifndef CROSSVAL_H
-#define CROSSVAL_H
+#ifndef GENSVM_CROSSVAL_H
+#define GENSVM_CROSSVAL_H
 
 #include "globals.h"
 
 // forward delaration
-struct MajData;
+struct GenData;
 
-void msvmmaj_make_cv_split(long N, long folds, long *cv_idx);
-void msvmmaj_get_tt_split(struct MajData *full_data, struct MajData *train_data,
-		struct MajData *test_data, long *cv_idx, long fold_idx);
+void gensvm_make_cv_split(long N, long folds, long *cv_idx);
+void gensvm_get_tt_split(struct GenData *full_data, struct GenData *train_data,
+		struct GenData *test_data, long *cv_idx, long fold_idx);
 
 #endif
diff --git a/include/msvmmaj.h b/include/gensvm.h
index 3d04f30..1231c29 100644
--- a/include/msvmmaj.h
+++ b/include/gensvm.h
@@ -1,22 +1,22 @@
 /**
- * @file msvmmaj.h
+ * @file gensvm.h
  * @author Gertjan van den Burg
  * @date August, 2013
  * @brief Definitions for common structures
  *
  * @details
- * Contains documentation and declarations of MajModel and MajData.
+ * Contains documentation and declarations of GenModel and GenData.
  *
  */
 
-#ifndef MSVMMAJ_H
-#define MSVMMAJ_H
+#ifndef GENSVM_H
+#define GENSVM_H
 
 #include "globals.h"
 #include "types.h"
 
 /**
- * @brief A structure to represent a single MSVMMaj model.
+ * @brief A structure to represent a single GenSVM model.
  *
  * @param weight_idx 		which weights to use (1 = unit, 2 = group)
  * @param K 			number of classes in the dataset
@@ -45,7 +45,7 @@
  * @TODO
  * change R to int, it's a binary matrix
  */
-struct MajModel {
+struct GenModel {
 	int weight_idx; 	
 	long K; 	
 	long n; 
@@ -80,11 +80,11 @@ struct MajModel {
  * @param *Z 		pointer to augmented data matrix
  * @param *RAW 		pointer to augmented raw data matrix
  * @param *J 		pointer to regularization vector
- * @param kerneltype 	kerneltype used in MajData::Z
- * @param *kernelparam 	kernel parameters used in MajData::Z
+ * @param kerneltype 	kerneltype used in GenData::Z
+ * @param *kernelparam 	kernel parameters used in GenData::Z
  *
  */
-struct MajData {
+struct GenData {
 	long K; 		
 	long n; 		
 	long m;		 
diff --git a/include/gensvm_init.h b/include/gensvm_init.h
new file mode 100644
index 0000000..544c960
--- /dev/null
+++ b/include/gensvm_init.h
@@ -0,0 +1,28 @@
+/**
+ * @file gensvm_init.h
+ * @author Gertjan van den Burg
+ * @date January, 2014
+ * @brief Header file for gensvm_init.c
+ *
+ * @details
+ * Contains function declarations for the initialization functions for
+ * GenModel and GenData structures.
+ */
+
+#ifndef GENSVM_INIT_H
+#define GENSVM_INIT_H
+
+// forward declaration
+struct GenData;
+struct GenModel;
+
+struct GenModel *gensvm_init_model();
+
+struct GenData *gensvm_init_data();
+
+void gensvm_allocate_model(struct GenModel *model);
+void gensvm_reallocate_model(struct GenModel *model, long n, long m);
+void gensvm_free_model(struct GenModel *model);
+void gensvm_free_data(struct GenData *data);
+
+#endif
diff --git a/include/gensvm_io.h b/include/gensvm_io.h
new file mode 100644
index 0000000..35b6a5a
--- /dev/null
+++ b/include/gensvm_io.h
@@ -0,0 +1,30 @@
+/**
+ * @file gensvm_io.h
+ * @author Gertjan van den Burg
+ * @date January, 2014
+ * @brief Header files for gensvm_io.c
+ *
+ * @details
+ * Function declarations for input/output functions.
+ *
+ */
+
+#ifndef GENSVM_IO_H
+#define GENSVM_IO_H
+
+#include "globals.h"
+
+// forward declarations
+struct GenData;
+struct GenModel;
+
+// function declarations
+void gensvm_read_data(struct GenData *dataset, char *data_file);
+
+void gensvm_read_model(struct GenModel *model, char *model_filename);
+void gensvm_write_model(struct GenModel *model, char *output_filename);
+
+void gensvm_write_predictions(struct GenData *data, long *predy, 
+		char *output_filename);
+
+#endif
diff --git a/include/gensvm_kernel.h b/include/gensvm_kernel.h
new file mode 100644
index 0000000..bf46bbc
--- /dev/null
+++ b/include/gensvm_kernel.h
@@ -0,0 +1,38 @@
+/**
+ * @file gensvm_kernel.h
+ * @author Gertjan van den Burg
+ * @date January, 2014
+ * @brief Header file for kernel functionality
+ *
+ * @details
+ * Contains function declarations for computing the kernel matrix
+ * in nonlinear MSVMGen. Additional kernel functions should be 
+ * included here and in gensvm_kernel.c
+ *
+ */
+
+#ifndef GENSVM_KERNEL_H
+#define GENSVM_KERNEL_H
+
+#include "globals.h"
+
+// forward declarations
+struct GenData;
+struct GenModel;
+
+// function declarations
+void gensvm_make_kernel(struct GenModel *model, struct GenData *data);
+
+long gensvm_make_eigen(double *K, long n, double **P, double **Lambda);
+
+void gensvm_make_crosskernel(struct GenModel *model,
+	       	struct GenData *data_train, struct GenData *data_test,
+		double **K2);
+
+double gensvm_compute_rbf(double *x1, double *x2, double *kernelparam,
+		long n);
+double gensvm_compute_poly(double *x1, double *x2, double *kernelparam,
+		long n);
+double gensvm_compute_sigmoid(double *x1, double *x2, double *kernelparam,
+		long n);
+#endif
diff --git a/include/msvmmaj_lapack.h b/include/gensvm_lapack.h
index 6ea1122..7ac4fc9 100644
--- a/include/msvmmaj_lapack.h
+++ b/include/gensvm_lapack.h
@@ -1,16 +1,16 @@
 /**
- * @file msvmmaj_lapack.h
+ * @file gensvm_lapack.h
  * @author Gertjan van den Burg
  * @date August, 2013
- * @brief Header file for msvmmaj_lapack.c
+ * @brief Header file for gensvm_lapack.c
  * 
  * @details
  * Function declarations for external LAPACK functions 
  *
  */
 
-#ifndef MSVMMAJ_LAPACK_H
-#define MSVMMAJ_LAPACK_H
+#ifndef GENSVM_LAPACK_H
+#define GENSVM_LAPACK_H
 
 #include "globals.h"
 
diff --git a/include/msvmmaj_matrix.h b/include/gensvm_matrix.h
index db64303..01be3da 100644
--- a/include/msvmmaj_matrix.h
+++ b/include/gensvm_matrix.h
@@ -1,16 +1,16 @@
 /**
- * @file msvmmaj_matrix.h
+ * @file gensvm_matrix.h
  * @author Gertjan van den Burg
  * @date August, 2013
- * @brief Header file for msvmmaj_matrix.c
+ * @brief Header file for gensvm_matrix.c
  *
  * @details
  * Contains function declarations for functions useful for dealing with matrices.
  *
  */
 
-#ifndef MSVMMAJ_MATRIX_H
-#define MSVMMAJ_MATRIX_H
+#ifndef GENSVM_MATRIX_H
+#define GENSVM_MATRIX_H
 
 #include "globals.h"
 
diff --git a/include/gensvm_pred.h b/include/gensvm_pred.h
new file mode 100644
index 0000000..0cce20b
--- /dev/null
+++ b/include/gensvm_pred.h
@@ -0,0 +1,32 @@
+/**
+ * @file gensvm_pred.h
+ * @author Gertjan van den Burg
+ * @date August, 2013
+ * @brief Header file for gensvm_pred.c
+ *
+ * @details
+ * Contains function declarations for prediction functions.
+ *
+ */
+
+#ifndef GENSVM_PRED_H
+#define GENSVM_PRED_H
+
+#include "globals.h"
+
+// forward declarations
+struct GenData;
+struct GenModel;
+
+// function declarations
+void gensvm_predict_labels(struct GenData *data_test,
+	       	struct GenData *data_train, struct GenModel *model,
+	       	long *predy);
+void gensvm_predict_labels_linear(struct GenData *data,
+	       	struct GenModel *model, long *predy);
+void gensvm_predict_labels_kernel(struct GenData *data_test,
+		struct GenData *data_train, struct GenModel *model,
+		long *predy);
+double gensvm_prediction_perf(struct GenData *data, long *perdy);
+
+#endif
diff --git a/include/msvmmaj_sv.h b/include/gensvm_sv.h
index e37ffc4..5664f83 100644
--- a/include/msvmmaj_sv.h
+++ b/include/gensvm_sv.h
@@ -1,19 +1,19 @@
 /**
- * @file msvmmaj_sv.h
+ * @file gensvm_sv.h
  * @author Gertjan van den Burg
  * @date May, 2014
- * @brief Header file for msvmmaj_sv.c
+ * @brief Header file for gensvm_sv.c
  *
  * @details
  * Contains function declarations for functions used to count support vectors.
  *
  */
 
-#ifndef MSVMMAJ_SV_H
-#define MSVMMAJ_SV_H
+#ifndef GENSVM_SV_H
+#define GENSVM_SV_H
 
 #include "globals.h"
 
-long msvmmaj_num_sv(struct MajModel *model, struct MajData *data);
+long gensvm_num_sv(struct GenModel *model, struct GenData *data);
 
 #endif
diff --git a/include/gensvm_train.h b/include/gensvm_train.h
new file mode 100644
index 0000000..f59359d
--- /dev/null
+++ b/include/gensvm_train.h
@@ -0,0 +1,31 @@
+/**
+ * @file gensvm_train.h
+ * @author Gertjan van den Burg
+ * @date August, 2013
+ * @brief Header file for gensvm_train.c
+ *
+ * @details
+ * Contains function declarations for functions used to train a single
+ * GenModel.
+ *
+ */
+
+#ifndef GENSVM_TRAIN_H
+#define GENSVM_TRAIN_H
+
+#include "globals.h"
+
+//forward declarations
+struct GenData;
+struct GenModel;
+
+// function declarations
+void gensvm_optimize(struct GenModel *model, struct GenData *data);
+
+double gensvm_get_loss(struct GenModel *model, struct GenData *data,
+		double *ZV);
+
+void gensvm_get_update(struct GenModel *model, struct GenData *data,
+		double *B, double *ZAZ, double *ZAZV, double *ZAZVT);
+
+#endif
diff --git a/include/msvmmaj_train_dataset.h b/include/gensvm_train_dataset.h
index 95e2c74..299bc52 100644
--- a/include/msvmmaj_train_dataset.h
+++ b/include/gensvm_train_dataset.h
@@ -1,5 +1,5 @@
 /**
- * @file msvmmaj_train_dataset.h
+ * @file gensvm_train_dataset.h
  * @author Gertjan van den Burg
  * @date August, 2013
  * @brief Structs and functions necessary for the grid search
@@ -12,8 +12,8 @@
  *
  */
 
-#ifndef MSVMMAJ_TRAIN_DATASET_H
-#define MSVMMAJ_TRAIN_DATASET_H
+#ifndef GENSVM_TRAIN_DATASET_H
+#define GENSVM_TRAIN_DATASET_H
 
 #include "globals.h"
 #include "types.h"
@@ -23,13 +23,13 @@
  *
  * @param folds 	number of folds in cross validation
  * @param ID 		numeric id of the task in the queue
- * @param weight_idx 	parameter for the MajModel
- * @param p 		parameter for the MajModel
- * @param kappa 	parameter for the MajModel
- * @param lambda 	parameter for the MajModel
- * @param epsilon 	parameter for the MajModel
- * @param kerneltype 	parameter for the MajModel
- * @param *kernelparam parameters for the MajModel
+ * @param weight_idx 	parameter for the GenModel
+ * @param p 		parameter for the GenModel
+ * @param kappa 	parameter for the GenModel
+ * @param lambda 	parameter for the GenModel
+ * @param epsilon 	parameter for the GenModel
+ * @param kerneltype 	parameter for the GenModel
+ * @param *kernelparam parameters for the GenModel
  * @param *train_data 	pointer to the training data
  * @param *test_data 	pointer to the test data (if any)
  * @param performance 	performance after cross validation
@@ -44,8 +44,8 @@ struct Task {
 	double lambda;
 	double epsilon;
 	double *kernelparam;
-	struct MajData *train_data;
-	struct MajData *test_data;
+	struct GenData *train_data;
+	struct GenData *test_data;
 	double performance;
 };
 
@@ -120,7 +120,7 @@ struct Training {
 };
 
 void make_queue(struct Training *training, struct Queue *queue,
-		struct MajData *train_data, struct MajData *test_data);
+		struct GenData *train_data, struct GenData *test_data);
 
 struct Task *get_next_task(struct Queue *q);
 void start_training_tt(struct Queue *q);
@@ -129,11 +129,11 @@ void free_queue(struct Queue *q);
 
 void consistency_repeats(struct Queue *q, long repeats, TrainType traintype);
 
-double cross_validation(struct MajModel *model, struct MajData *data,
+double cross_validation(struct GenModel *model, struct GenData *data,
 	       	long folds);
 
-void make_model_from_task(struct Task *task, struct MajModel *model);
-void copy_model(struct MajModel *from, struct MajModel *to);
+void make_model_from_task(struct Task *task, struct GenModel *model);
+void copy_model(struct GenModel *from, struct GenModel *to);
 
 void print_progress_string(struct Task *task, long N);
 #endif
diff --git a/include/globals.h b/include/globals.h
index 55fb6c4..46cc3d2 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef MSVMMAJ_GLOBALS_H
-#define MSVMMAJ_GLOBALS_H
+#ifndef GENSVM_GLOBALS_H
+#define GENSVM_GLOBALS_H
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/include/libGenSVM.h b/include/libGenSVM.h
new file mode 100644
index 0000000..cfa2815
--- /dev/null
+++ b/include/libGenSVM.h
@@ -0,0 +1,42 @@
+/**
+ * @file libGenSVM.h
+ * @author Gertjan van den Burg
+ * @date August, 2013
+ * @brief Header file for the core GenSVM library libGenSVM.c
+ *
+ * @details
+ * The core computational routines for GenSVM are defined in libGenSVM.c.
+ * This file contains function declarations for these functions.
+ *
+ */
+
+/**
+ * @todo 
+ * rename this file and libGenSVM.c to correspond with the lowercase convention.
+ * Also change the name of the include guard.
+ */ 
+#ifndef LIBGENSVM_H
+#define LIBGENSVM_H
+
+#include "globals.h"
+
+// forward declarations 
+struct GenData;
+struct GenModel;
+
+// function declarations
+void gensvm_simplex_gen(long K, double *U);
+void gensvm_category_matrix(struct GenModel *model, struct GenData *data);
+void gensvm_simplex_diff(struct GenModel *model, struct GenData *dataset);
+
+void gensvm_calculate_errors(struct GenModel *model, struct GenData *data,
+	       	double *ZV);
+void gensvm_calculate_huber(struct GenModel *model);
+
+void gensvm_step_doubling(struct GenModel *model);
+
+void gensvm_seed_model_V(struct GenModel *from_model,
+	       	struct GenModel *to_model, struct GenData *data);
+void gensvm_initialize_weights(struct GenData *data, struct GenModel *model);
+
+#endif
diff --git a/include/libMSVMMaj.h b/include/libMSVMMaj.h
deleted file mode 100644
index a9bd789..0000000
--- a/include/libMSVMMaj.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file libMSVMMaj.h
- * @author Gertjan van den Burg
- * @date August, 2013
- * @brief Header file for the core MSVMMaj library libMSVMMaj.c
- *
- * @details
- * The core computational routines for MSVMMaj are defined in libMSVMMaj.c.
- * This file contains function declarations for these functions.
- *
- */
-
-/**
- * @todo 
- * rename this file and libMSVMMaj.c to correspond with the lowercase convention.
- * Also change the name of the include guard.
- */ 
-#ifndef LIBMSVMMAJ_H
-#define LIBMSVMMAJ_H
-
-#include "globals.h"
-
-// forward declarations 
-struct MajData;
-struct MajModel;
-
-// function declarations
-void msvmmaj_simplex_gen(long K, double *U);
-void msvmmaj_category_matrix(struct MajModel *model, struct MajData *data);
-void msvmmaj_simplex_diff(struct MajModel *model, struct MajData *dataset);
-
-void msvmmaj_calculate_errors(struct MajModel *model, struct MajData *data,
-	       	double *ZV);
-void msvmmaj_calculate_huber(struct MajModel *model);
-
-void msvmmaj_step_doubling(struct MajModel *model);
-
-void msvmmaj_seed_model_V(struct MajModel *from_model,
-	       	struct MajModel *to_model, struct MajData *data);
-void msvmmaj_initialize_weights(struct MajData *data, struct MajModel *model);
-
-#endif
diff --git a/include/msvmmaj_init.h b/include/msvmmaj_init.h
deleted file mode 100644
index 281214c..0000000
--- a/include/msvmmaj_init.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * @file msvmmaj_init.h
- * @author Gertjan van den Burg
- * @date January, 2014
- * @brief Header file for msvmmaj_init.c
- *
- * @details
- * Contains function declarations for the initialization functions for
- * MajModel and MajData structures.
- */
-
-#ifndef MSVMMAJ_INIT_H
-#define MSVMMAJ_INIT_H
-
-// forward declaration
-struct MajData;
-struct MajModel;
-
-struct MajModel *msvmmaj_init_model();
-
-struct MajData *msvmmaj_init_data();
-
-void msvmmaj_allocate_model(struct MajModel *model);
-void msvmmaj_reallocate_model(struct MajModel *model, long n, long m);
-void msvmmaj_free_model(struct MajModel *model);
-void msvmmaj_free_data(struct MajData *data);
-
-#endif
diff --git a/include/msvmmaj_io.h b/include/msvmmaj_io.h
deleted file mode 100644
index 99fb4dc..0000000
--- a/include/msvmmaj_io.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * @file msvmmaj_io.h
- * @author Gertjan van den Burg
- * @date January, 2014
- * @brief Header files for msvmmaj_io.c
- *
- * @details
- * Function declarations for input/output functions.
- *
- */
-
-#ifndef MSVMMAJ_IO_H
-#define MSVMMAJ_IO_H
-
-#include "globals.h"
-
-// forward declarations
-struct MajData;
-struct MajModel;
-
-// function declarations
-void msvmmaj_read_data(struct MajData *dataset, char *data_file);
-
-void msvmmaj_read_model(struct MajModel *model, char *model_filename);
-void msvmmaj_write_model(struct MajModel *model, char *output_filename);
-
-void msvmmaj_write_predictions(struct MajData *data, long *predy, 
-		char *output_filename);
-
-#endif
diff --git a/include/msvmmaj_kernel.h b/include/msvmmaj_kernel.h
deleted file mode 100644
index d4f169a..0000000
--- a/include/msvmmaj_kernel.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * @file msvmmaj_kernel.h
- * @author Gertjan van den Burg
- * @date January, 2014
- * @brief Header file for kernel functionality
- *
- * @details
- * Contains function declarations for computing the kernel matrix
- * in nonlinear MSVMMaj. Additional kernel functions should be 
- * included here and in msvmmaj_kernel.c
- *
- */
-
-#ifndef MSVMMAJ_KERNEL_H
-#define MSVMMAJ_KERNEL_H
-
-#include "globals.h"
-
-// forward declarations
-struct MajData;
-struct MajModel;
-
-// function declarations
-void msvmmaj_make_kernel(struct MajModel *model, struct MajData *data);
-
-long msvmmaj_make_eigen(double *K, long n, double **P, double **Lambda);
-
-void msvmmaj_make_crosskernel(struct MajModel *model,
-	       	struct MajData *data_train, struct MajData *data_test,
-		double **K2);
-
-double msvmmaj_compute_rbf(double *x1, double *x2, double *kernelparam,
-		long n);
-double msvmmaj_compute_poly(double *x1, double *x2, double *kernelparam,
-		long n);
-double msvmmaj_compute_sigmoid(double *x1, double *x2, double *kernelparam,
-		long n);
-#endif
diff --git a/include/msvmmaj_pred.h b/include/msvmmaj_pred.h
deleted file mode 100644
index c274cfa..0000000
--- a/include/msvmmaj_pred.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * @file msvmmaj_pred.h
- * @author Gertjan van den Burg
- * @date August, 2013
- * @brief Header file for msvmmaj_pred.c
- *
- * @details
- * Contains function declarations for prediction functions.
- *
- */
-
-#ifndef MSVMMAJ_PRED_H
-#define MSVMMAJ_PRED_H
-
-#include "globals.h"
-
-// forward declarations
-struct MajData;
-struct MajModel;
-
-// function declarations
-void msvmmaj_predict_labels(struct MajData *data_test,
-	       	struct MajData *data_train, struct MajModel *model,
-	       	long *predy);
-void msvmmaj_predict_labels_linear(struct MajData *data,
-	       	struct MajModel *model, long *predy);
-void msvmmaj_predict_labels_kernel(struct MajData *data_test,
-		struct MajData *data_train, struct MajModel *model,
-		long *predy);
-double msvmmaj_prediction_perf(struct MajData *data, long *perdy);
-
-#endif
diff --git a/include/msvmmaj_train.h b/include/msvmmaj_train.h
deleted file mode 100644
index 835100f..0000000
--- a/include/msvmmaj_train.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * @file msvmmaj_train.h
- * @author Gertjan van den Burg
- * @date August, 2013
- * @brief Header file for msvmmaj_train.c
- *
- * @details
- * Contains function declarations for functions used to train a single
- * MajModel.
- *
- */
-
-#ifndef MSVMMAJ_TRAIN_H
-#define MSVMMAJ_TRAIN_H
-
-#include "globals.h"
-
-//forward declarations
-struct MajData;
-struct MajModel;
-
-// function declarations
-void msvmmaj_optimize(struct MajModel *model, struct MajData *data);
-
-double msvmmaj_get_loss(struct MajModel *model, struct MajData *data,
-		double *ZV);
-
-void msvmmaj_get_update(struct MajModel *model, struct MajData *data,
-		double *B, double *ZAZ, double *ZAZV, double *ZAZVT);
-
-#endif
diff --git a/include/timer.h b/include/timer.h
index d4af649..a1b60a7 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef MSVMMAJ_TIMER_H
-#define MSVMMAJ_TIMER_H
+#ifndef GENSVM_TIMER_H
+#define GENSVM_TIMER_H
 
 #include "globals.h"
 
diff --git a/include/types.h b/include/types.h
index f6d008b..1cbcba0 100644
--- a/include/types.h
+++ b/include/types.h
@@ -9,8 +9,8 @@
  *
  */
 
-#ifndef MSVMMAJ_TYPES_H
-#define MSVMMAJ_TYPES_H
+#ifndef GENSVM_TYPES_H
+#define GENSVM_TYPES_H
 
 /**
  * @brief Implementation of true and false
diff --git a/include/util.h b/include/util.h
index 375a9c2..fe8d2a3 100644
--- a/include/util.h
+++ b/include/util.h
@@ -9,18 +9,18 @@
  *
  */
 
-#ifndef MSVMMAJ_UTIL_H
-#define MSVMMAJ_UTIL_H
+#ifndef GENSVM_UTIL_H
+#define GENSVM_UTIL_H
 
 #include "globals.h"
 
 // forward declarations
-struct MajData;
-struct MajModel;
+struct GenData;
+struct GenModel;
 
 // function declarations
-int msvmmaj_check_argv(int argc, char **argv, char *str);
-int msvmmaj_check_argv_eq(int argc, char **argv, char *str);
+int gensvm_check_argv(int argc, char **argv, char *str);
+int gensvm_check_argv_eq(int argc, char **argv, char *str);
 
 void note(const char *fmt,...);