Menu
▾
▴
clisp-cvs Digest, Vol 6, Issue 13
|
From: <cli...@li...> - 2006-10-11 19:03:10
|
Send clisp-cvs mailing list submissions to cli...@li... To subscribe or unsubscribe via the World Wide Web, visit https://lists.sourceforge.net/lists/listinfo/clisp-cvs or, via email, send a message with subject or body 'help' to cli...@li... You can reach the person managing the list at cli...@li... When replying, please edit your Subject line so it is more specific than "Re: Contents of clisp-cvs digest..." CLISP CVS commits for today Today's Topics: 1. clisp/doc impent.xml,1.274,1.275 (Sam Steingold) 2. clisp/src spvw.d,1.393,1.394 (Sam Steingold) 3. clisp/src ChangeLog,1.5413,1.5414 (Sam Steingold) 4. clisp/modules/libsvm test.tst,1.4,1.5 libsvm.lisp,1.5,1.6 (Sam Steingold) ---------------------------------------------------------------------- Message: 1 Date: Wed, 11 Oct 2006 01:21:24 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/doc impent.xml,1.274,1.275 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/doc In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv27885/doc Modified Files: impent.xml=20 Log Message: more svm docs Index: impent.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/doc/impent.xml,v retrieving revision 1.274 retrieving revision 1.275 diff -u -d -r1.274 -r1.275 --- impent.xml 10 Oct 2006 02:25:47 -0000 1.274 +++ impent.xml 11 Oct 2006 01:21:21 -0000 1.275 @@ -639,6 +639,7 @@ <!ENTITY len-r '<replaceable>length</replaceable>'> <!ENTITY line-r '<replaceable>line</replaceable>'> <!ENTITY list-r '<replaceable>list</replaceable>'> +<!ENTITY log-r '<replaceable>log</replaceable>'> <!ENTITY location-r '<replaceable>location</replaceable>'> <!ENTITY m-r '<replaceable>m</replaceable>'> <!ENTITY match-r '<replaceable>match</replaceable>'> ------------------------------ Message: 2 Date: Wed, 11 Oct 2006 01:47:20 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src spvw.d,1.393,1.394 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4897/src Modified Files: spvw.d=20 Log Message: (libopen): removed last patch (it was committed by error) Index: spvw.d =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/spvw.d,v retrieving revision 1.393 retrieving revision 1.394 diff -u -d -r1.393 -r1.394 --- spvw.d 5 Oct 2006 23:46:05 -0000 1.393 +++ spvw.d 11 Oct 2006 01:47:18 -0000 1.394 @@ -3470,20 +3470,10 @@ global void * libopen (const char* libname) { #if defined(WIN32_NATIVE) - var void *lib =3D (void*)LoadLibrary(libname); - if (NULL !=3D lib || strlen(libname) > MAX_PATH-5) return lib; - var char buf[MAX_PATH]; - strcpy(buf,libname); /* we KNOW that libname fits into buf! *= / - strcat(buf,".dll"); - return (void*)LoadLibrary(buf); + return (void*)LoadLibrary(libname); #else - var void *lib =3D dlopen(libname,RTLD_NOW|RTLD_GLOBAL); - if (NULL !=3D lib || strlen(libname) > MAXPATHLEN-4) return lib; - var char buf[MAXPATHLEN]; - strcpy(buf,libname); /* we KNOW that libname fits into buf! *= / - strcat(buf,".so"); /* FIXME: On UNIX_DARWIN, need to search for the library in /usr/lib *= / - return dlopen(buf,RTLD_NOW|RTLD_GLOBAL); + return dlopen(libname,RTLD_NOW|RTLD_GLOBAL); #endif } =20 ------------------------------ Message: 3 Date: Wed, 11 Oct 2006 03:19:28 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/src ChangeLog,1.5413,1.5414 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6002/src Modified Files: ChangeLog=20 Log Message: (predict-probability): prob_estimates is a DOUBLE-FLOAT vector, not an IN= T one Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/src/ChangeLog,v retrieving revision 1.5413 retrieving revision 1.5414 diff -u -d -r1.5413 -r1.5414 --- ChangeLog 11 Oct 2006 01:17:54 -0000 1.5413 +++ ChangeLog 11 Oct 2006 03:19:25 -0000 1.5414 @@ -1,5 +1,10 @@ 2006-10-10 Sam Steingold <sd...@gn...> =20 + * modules/libsvm/libsvm.lisp (predict-probability): prob_estimates + is a DOUBLE-FLOAT vector, not an INT one + +2006-10-10 Sam Steingold <sd...@gn...> + * _clisp.c (main): fixed handling of "--" option terminator Reported by Fran=C3=A7ois-Ren=C3=A9 =C3=90VB Rideau <fa...@gm...> =20 ------------------------------ Message: 4 Date: Wed, 11 Oct 2006 03:19:28 +0000 From: Sam Steingold <sd...@us...> Subject: clisp/modules/libsvm test.tst,1.4,1.5 libsvm.lisp,1.5,1.6 To: cli...@li... Message-ID: <E1G...@ma...> Update of /cvsroot/clisp/clisp/modules/libsvm In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv6002/modules/libsvm Modified Files: test.tst libsvm.lisp=20 Log Message: (predict-probability): prob_estimates is a DOUBLE-FLOAT vector, not an IN= T one Index: test.tst =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/modules/libsvm/test.tst,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- test.tst 11 Oct 2006 01:13:52 -0000 1.4 +++ test.tst 11 Oct 2006 03:19:26 -0000 1.5 @@ -66,6 +66,12 @@ (libsvm:get-labels model) #(-1 1) (libsvm:check-probability-model model) 0 (libsvm:get-svr-probability model) 0d0 +(let* ((l (libsvm:problem-l f-problem-2-7)) + (y (libsvm:problem-y f-problem-2-7 l)) + (x (libsvm:problem-x f-problem-2-7 l))) + (dotimes (i 10 l) + (print (list (aref y i) (libsvm:predict-values model (aref x i)))))) +1000 (libsvm:save-model "svm-model" model) 0 (libsvm:destroy-model (libsvm:load-model "svm-model")) NIL (libsvm:destroy-model model) NIL @@ -75,36 +81,55 @@ (libsvm:save-problem "svm-problem" f-problem-3-7) NIL (progn (setf f-parameter (libsvm:make-parameter :v v-parameter 'LIBSVM::nu 5d= -1 - 'LIBSVM::svm_type libsvm:NU_S= VR) + 'LIBSVM::svm_type libsvm:NU_S= VC + 'LIBSVM::probability 1) v-parameter (ffi:foreign-value f-parameter)) (show (libsvm:parameter-alist f-parameter) :pretty t) (=3D (ffi:slot (ffi:foreign-value f-parameter) 'LIBSVM::svm_type) - libsvm:NU_SVR)) + libsvm:NU_SVC)) T =20 -(let ((vec (libsvm:cross-validation f-problem-3-7 f-parameter 3)) - (ht (make-hash-table))) - (loop :for x :across vec :do (incf (gethash x ht 0))) - ;(show ht :pretty t) +(let ((vec (libsvm:cross-validation f-problem-3-7 f-parameter 3))) (list (length vec) (count 1d0 vec) (count -1d0 vec) (count 0d0 vec))) -(1000 0 0 1000) +(1000 133 473 394) =20 (defparameter model (libsvm:train f-problem-3-7 f-parameter)) MODEL -(ffi:enum-from-value 'libsvm:svm_type (libsvm:get-svm-type model)) libsv= m:NU_SVR +(ffi:enum-from-value 'libsvm:svm_type (libsvm:get-svm-type model)) libsv= m:NU_SVC (libsvm:get-nr-class model) 3 -(libsvm:get-labels model) #(1 -1) +(libsvm:get-labels model) #(-1 0 1) (libsvm:check-probability-model model) 1 -(libsvm:get-svr-probability model) 1d0 +(libsvm:get-svr-probability model) 0d0 =20 (let* ((l (libsvm:problem-l f-problem-3-7)) (y (libsvm:problem-y f-problem-3-7 l)) (x (libsvm:problem-x f-problem-3-7 l))) - (dotimes (i l) - (multiple-value-bind (v e) - (ignore-errors (libsvm:predict-values model (aref x i))) - (print (list (aref y i) (if e (princ-to-string e) v)))))) -NIL + (dotimes (i 10 l) + (print (list (aref y i) (libsvm:predict model (aref x i)) + (multiple-value-list + (libsvm:predict-probability model (aref x i))))))) +1000 +(libsvm:destroy-model model) NIL =20 +(progn + (setf f-parameter (libsvm:make-parameter :v v-parameter 'LIBSVM::nu 5d= -1 + 'LIBSVM::svm_type libsvm:EPSI= LON_SVR + 'LIBSVM::probability 1) + v-parameter (ffi:foreign-value f-parameter)) + (show (libsvm:parameter-alist f-parameter) :pretty t) + (=3D (ffi:slot (ffi:foreign-value f-parameter) 'LIBSVM::svm_type) + libsvm:EPSILON_SVR)) +T +(defparameter model (libsvm:train f-problem-3-7 f-parameter)) MODEL +(libsvm:check-probability-model model) 1 +(type-of (show (libsvm:get-svr-probability model))) DOUBLE-FLOAT +(let* ((l (libsvm:problem-l f-problem-3-7)) + (y (libsvm:problem-y f-problem-3-7 l)) + (x (libsvm:problem-x f-problem-3-7 l))) + (dotimes (i 10 l) + (print (list (aref y i) (libsvm:predict model (aref x i)) + (multiple-value-list + (libsvm:predict-probability model (aref x i))))))) +1000 (libsvm:destroy-model model) NIL =20 (ffi:validp f-problem-3-7) T Index: libsvm.lisp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /cvsroot/clisp/clisp/modules/libsvm/libsvm.lisp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- libsvm.lisp 11 Oct 2006 01:15:58 -0000 1.5 +++ libsvm.lisp 11 Oct 2006 03:19:26 -0000 1.6 @@ -168,7 +168,8 @@ (prob_estimates c-pointer)) (:return-type double-float)) (defun predict-probability (model x) - (with-foreign-object (prob_estimates `(c-array int ,(get-nr-class mode= l))) + (with-foreign-object + (prob_estimates `(c-array double-float ,(get-nr-class model))) (values (svm_predict_probability model x prob_estimates) (foreign-value prob_estimates)))) =20 ------------------------------ ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job ea= sier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronim= o http://sel.as-us.falkag.net/sel?cmd=3Dlnk&kid=3D120709&bid=3D263057&dat=3D= 121642 ------------------------------ _______________________________________________ clisp-cvs mailing list cli...@li... https://lists.sourceforge.net/lists/listinfo/clisp-cvs End of clisp-cvs Digest, Vol 6, Issue 13 **************************************** |