diff options
| -rw-r--r-- | Makefile | 16 | ||||
| -rw-r--r-- | include/gensvm_crossval.h (renamed from include/crossval.h) | 0 | ||||
| -rw-r--r-- | include/gensvm_timer.h (renamed from include/timer.h) | 0 | ||||
| -rw-r--r-- | include/gensvm_util.h (renamed from include/util.h) | 0 | ||||
| -rw-r--r-- | src/GenSVMgrid.c | 6 | ||||
| -rw-r--r-- | src/GenSVMpred.c | 2 | ||||
| -rw-r--r-- | src/GenSVMtrain.c | 4 | ||||
| -rw-r--r-- | src/GenSVMtraintest.c | 2 | ||||
| -rw-r--r-- | src/gensvm_crossval.c (renamed from src/crossval.c) | 2 | ||||
| -rw-r--r-- | src/gensvm_io.c | 2 | ||||
| -rw-r--r-- | src/gensvm_kernel.c | 2 | ||||
| -rw-r--r-- | src/gensvm_matrix.c | 2 | ||||
| -rw-r--r-- | src/gensvm_timer.c (renamed from src/timer.c) | 2 | ||||
| -rw-r--r-- | src/gensvm_train.c | 2 | ||||
| -rw-r--r-- | src/gensvm_train_dataset.c | 6 | ||||
| -rw-r--r-- | src/gensvm_util.c (renamed from src/util.c) | 2 |
16 files changed, 25 insertions, 25 deletions
@@ -13,35 +13,35 @@ all: lib/libgensvm.a $(EXECS) override LDFLAGS+=-lcblas -llapack -lm lib/libgensvm.a: \ - src/crossval.o \ src/libGenSVM.o \ + src/gensvm_crossval.o \ src/gensvm_init.o \ src/gensvm_io.o \ src/gensvm_kernel.o \ src/gensvm_lapack.o \ src/gensvm_matrix.o \ src/gensvm_pred.o \ + src/gensvm_strutil.o \ src/gensvm_sv.o \ src/gensvm_train.o \ src/gensvm_train_dataset.o \ - src/strutil.o \ - src/timer.o \ - src/util.o + src/gensvm_timer.o \ + src/gensvm_util.o @ar rcs lib/libgensvm.a \ - src/crossval.o \ src/libGenSVM.o \ + src/gensvm_crossval.o \ src/gensvm_init.o \ src/gensvm_io.o \ src/gensvm_matrix.o \ src/gensvm_kernel.o \ src/gensvm_lapack.o \ src/gensvm_pred.o \ + src/gensvm_strutil.o \ src/gensvm_sv.o \ src/gensvm_train.o \ src/gensvm_train_dataset.o \ - src/strutil.o \ - src/timer.o \ - src/util.o + src/gensvm_timer.o \ + src/gensvm_util.o @echo libgensvm.a... gensvm: src/GenSVMtraintest.c lib/libgensvm.a diff --git a/include/crossval.h b/include/gensvm_crossval.h index fa3cca7..fa3cca7 100644 --- a/include/crossval.h +++ b/include/gensvm_crossval.h diff --git a/include/timer.h b/include/gensvm_timer.h index a1b60a7..a1b60a7 100644 --- a/include/timer.h +++ b/include/gensvm_timer.h diff --git a/include/util.h b/include/gensvm_util.h index fe8d2a3..fe8d2a3 100644 --- a/include/util.h +++ b/include/gensvm_util.h diff --git a/src/GenSVMgrid.c b/src/GenSVMgrid.c index c02f848..0b6d33e 100644 --- a/src/GenSVMgrid.c +++ b/src/GenSVMgrid.c @@ -21,15 +21,15 @@ #include <time.h> -#include "crossval.h" #include "gensvm.h" +#include "gensvm_crossval.h" #include "gensvm_io.h" #include "gensvm_init.h" #include "gensvm_pred.h" +#include "gensvm_strutil.h" #include "gensvm_train.h" #include "gensvm_train_dataset.h" -#include "gensvm_strutil.h" -#include "util.h" +#include "gensvm_util.h" #define MINARGS 2 diff --git a/src/GenSVMpred.c b/src/GenSVMpred.c index c874aaf..ef2c97c 100644 --- a/src/GenSVMpred.c +++ b/src/GenSVMpred.c @@ -28,7 +28,7 @@ #include "gensvm_init.h" #include "gensvm_io.h" #include "gensvm_pred.h" -#include "util.h" +#include "gensvm_util.h" #define MINARGS 3 diff --git a/src/GenSVMtrain.c b/src/GenSVMtrain.c index f0b931f..63e2512 100644 --- a/src/GenSVMtrain.c +++ b/src/GenSVMtrain.c @@ -14,13 +14,13 @@ #include <time.h> #include <math.h> -#include "gensvm_kernel.h" #include "libGenSVM.h" #include "gensvm.h" #include "gensvm_io.h" #include "gensvm_init.h" +#include "gensvm_kernel.h" #include "gensvm_train.h" -#include "util.h" +#include "gensvm_util.h" #define MINARGS 2 diff --git a/src/GenSVMtraintest.c b/src/GenSVMtraintest.c index e15b340..c5f09f8 100644 --- a/src/GenSVMtraintest.c +++ b/src/GenSVMtraintest.c @@ -19,7 +19,7 @@ #include "gensvm_train.h" #include "gensvm_pred.h" #include "libGenSVM.h" -#include "util.h" +#include "gensvm_util.h" #define MINARGS 2 diff --git a/src/crossval.c b/src/gensvm_crossval.c index 85f9341..864e692 100644 --- a/src/crossval.c +++ b/src/gensvm_crossval.c @@ -13,8 +13,8 @@ * */ -#include "crossval.h" #include "gensvm.h" +#include "gensvm_crossval.h" #include "gensvm_matrix.h" /** diff --git a/src/gensvm_io.c b/src/gensvm_io.c index ce92805..01f1db5 100644 --- a/src/gensvm_io.c +++ b/src/gensvm_io.c @@ -14,7 +14,7 @@ #include "gensvm_io.h" #include "gensvm_matrix.h" #include "gensvm_strutil.h" -#include "timer.h" +#include "gensvm_timer.h" /** * @brief Read data from file diff --git a/src/gensvm_kernel.c b/src/gensvm_kernel.c index 5548f34..a6bc9fc 100644 --- a/src/gensvm_kernel.c +++ b/src/gensvm_kernel.c @@ -18,7 +18,7 @@ #include "gensvm_kernel.h" #include "gensvm_lapack.h" #include "gensvm_matrix.h" -#include "util.h" +#include "gensvm_util.h" /** * @brief Do the preprocessing steps needed to perform kernel GenSVM diff --git a/src/gensvm_matrix.c b/src/gensvm_matrix.c index 43f284f..66e3947 100644 --- a/src/gensvm_matrix.c +++ b/src/gensvm_matrix.c @@ -13,7 +13,7 @@ */ #include "gensvm_matrix.h" -#include "util.h" +#include "gensvm_util.h" /** * @brief print a matrix diff --git a/src/timer.c b/src/gensvm_timer.c index 254f3da..a871887 100644 --- a/src/timer.c +++ b/src/gensvm_timer.c @@ -12,7 +12,7 @@ #include <time.h> -#include "timer.h" +#include "gensvm_timer.h" /** * @brief Calculate the time between two clocks diff --git a/src/gensvm_train.c b/src/gensvm_train.c index 776e546..680d0dd 100644 --- a/src/gensvm_train.c +++ b/src/gensvm_train.c @@ -19,7 +19,7 @@ #include "gensvm_matrix.h" #include "gensvm_sv.h" #include "gensvm_train.h" -#include "util.h" +#include "gensvm_util.h" /** * Maximum number of iterations of the algorithm. diff --git a/src/gensvm_train_dataset.c b/src/gensvm_train_dataset.c index 5925b5c..4f42040 100644 --- a/src/gensvm_train_dataset.c +++ b/src/gensvm_train_dataset.c @@ -12,17 +12,17 @@ #include <math.h> #include <time.h> -#include "crossval.h" #include "libGenSVM.h" #include "gensvm.h" +#include "gensvm_crossval.h" #include "gensvm_init.h" #include "gensvm_kernel.h" #include "gensvm_matrix.h" #include "gensvm_train.h" #include "gensvm_train_dataset.h" #include "gensvm_pred.h" -#include "util.h" -#include "timer.h" +#include "gensvm_util.h" +#include "gensvm_timer.h" extern FILE *GENSVM_OUTPUT_FILE; diff --git a/src/util.c b/src/gensvm_util.c index 23ee4e5..aa4e5d9 100644 --- a/src/util.c +++ b/src/gensvm_util.c @@ -11,7 +11,7 @@ */ #include <stdarg.h> -#include "util.h" +#include "gensvm_util.h" FILE *GENSVM_OUTPUT_FILE; ///< The #GENSVM_OUTPUT_FILE specifies the ///< output stream to which all output is |