diff --git a/HSvm.cabal b/HSvm.cabal --- a/HSvm.cabal +++ b/HSvm.cabal @@ -1,9 +1,9 @@ Cabal-Version: 3.0 Name: HSvm -Version: 1.0.3.32 +Version: 1.0.3.35 Copyright: (c) 2009 Paolo Losi, 2017 Pavel Ryzhov Maintainer: Pavel Ryzhov -License: BSD-2-Clause +License: BSD-3-Clause License-File: LICENSE Author: Paolo Losi Category: Datamining, Classification @@ -18,12 +18,12 @@ source-repository head type: git location: https://github.com/paulrzcz/HSvm.git - tag: 1.0.3.32 + tag: 1.0.3.35 Library Default-Language: Haskell2010 Build-Depends: base >= 4 && < 5 - , containers >= 0.6.7 && < 0.7 + , containers >= 0.6.7 && < 0.8 Exposed-modules: Data.SVM , Data.SVM.Raw Includes: svm.h diff --git a/cbits/svm.cpp b/cbits/svm.cpp --- a/cbits/svm.cpp +++ b/cbits/svm.cpp @@ -54,7 +54,7 @@ char buf[BUFSIZ]; va_list ap; va_start(ap,fmt); - vsprintf(buf,fmt,ap); + vsnprintf(buf,BUFSIZ,fmt,ap); va_end(ap); (*svm_print_string)(buf); } @@ -71,7 +71,7 @@ class Cache { public: - Cache(int l,long int size); + Cache(int l,size_t size); ~Cache(); // request data [0,len) @@ -81,7 +81,7 @@ void swap_index(int i, int j); private: int l; - long int size; + size_t size; struct head_t { head_t *prev, *next; // a circular list @@ -95,12 +95,12 @@ void lru_insert(head_t *h); }; -Cache::Cache(int l_,long int size_):l(l_),size(size_) +Cache::Cache(int l_,size_t size_):l(l_),size(size_) { head = (head_t *)calloc(l,sizeof(head_t)); // initialized to 0 size /= sizeof(Qfloat); - size -= l * sizeof(head_t) / sizeof(Qfloat); - size = max(size, 2 * (long int) l); // cache must be large enough for two columns + size_t header_size = l * sizeof(head_t) / sizeof(Qfloat); + size = max(size, 2 * (size_t) l + header_size) - header_size; // cache must be large enough for two columns lru_head.next = lru_head.prev = &lru_head; } @@ -136,7 +136,7 @@ if(more > 0) { // free old space - while(size < more) + while(size < (size_t)more) { head_t *old = lru_head.next; lru_delete(old); @@ -148,7 +148,7 @@ // allocate new space h->data = (Qfloat *)realloc(h->data,sizeof(Qfloat)*len); - size -= more; + size -= more; // previous while loop guarantees size >= more and subtraction of size_t variable will not underflow swap(h->len,len); } @@ -317,14 +317,6 @@ return sum; } -void print_node(const svm_node *p) { - while(p->index != -1) { - printf("%d:%.8g ",p->index,p->value); - p++; - } - printf("\n"); -} - double Kernel::k_function(const svm_node *x, const svm_node *y, const svm_parameter& param) { @@ -1282,7 +1274,7 @@ :Kernel(prob.l, prob.x, param) { clone(y,y_,prob.l); - cache = new Cache(prob.l,(long int)(param.cache_size*(1<<20))); + cache = new Cache(prob.l,(size_t)(param.cache_size*(1<<20))); QD = new double[prob.l]; for(int i=0;i*kernel_function)(i,i); @@ -1334,7 +1326,7 @@ ONE_CLASS_Q(const svm_problem& prob, const svm_parameter& param) :Kernel(prob.l, prob.x, param) { - cache = new Cache(prob.l,(long int)(param.cache_size*(1<<20))); + cache = new Cache(prob.l,(size_t)(param.cache_size*(1<<20))); QD = new double[prob.l]; for(int i=0;i*kernel_function)(i,i); @@ -1381,7 +1373,7 @@ :Kernel(prob.l, prob.x, param) { l = prob.l; - cache = new Cache(l,(long int)(param.cache_size*(1<<20))); + cache = new Cache(l,(size_t)(param.cache_size*(1<<20))); QD = new double[2*l]; sign = new schar[2*l]; index = new int[2*l]; @@ -3167,15 +3159,6 @@ model_ptr->nSV = NULL; } -void svm_destroy_model(struct svm_model *model_ptr) -{ - if(model_ptr != NULL) - { - svm_free_model_content(model_ptr); - free(model_ptr); - } -} - void svm_free_and_destroy_model(svm_model** model_ptr_ptr) { if(model_ptr_ptr != NULL && *model_ptr_ptr != NULL) @@ -3328,6 +3311,17 @@ svm_print_string = print_func; } +// added by HSvm + +void svm_destroy_model(struct svm_model *model_ptr) +{ + if(model_ptr != NULL) + { + svm_free_model_content(model_ptr); + free(model_ptr); + } +} + int clone_model_support_vectors(svm_model* model) { svm_node **new_sv_array; @@ -3364,4 +3358,12 @@ free(model->SV); model->SV = new_sv_array; return 0; +} + +void print_node(const svm_node *p) { + while(p->index != -1) { + printf("%d:%.8g ",p->index,p->value); + p++; + } + printf("\n"); } diff --git a/cbits/svm.h b/cbits/svm.h --- a/cbits/svm.h +++ b/cbits/svm.h @@ -1,7 +1,7 @@ #ifndef _LIBSVM_H #define _LIBSVM_H -#define LIBSVM_VERSION 332 +#define LIBSVM_VERSION 335 #ifdef __cplusplus extern "C" { @@ -101,7 +101,6 @@ // added by HSvm void svm_destroy_model(struct svm_model *model_ptr); int clone_model_support_vectors(struct svm_model *model); - #ifdef __cplusplus } diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +### 1.0.3.35 +* [LibSVM version 3.35](https://www.csie.ntu.edu.tw/~cjlin/libsvm/) +* GHC 9.10's containers 0.7 are supported. + ### 1.0.3.32 * [LibSVM version 3.32](https://www.csie.ntu.edu.tw/~cjlin/libsvm/) * Decided to promote this version to major one after so many years of alpha releases.