[libsvm/f13/master: 5/5] Merge branch 'master' into f13

Ding-Yi Chen dchen at fedoraproject.org
Mon Nov 8 02:27:20 UTC 2010


commit cc443d804d93bed5e71e7296ba39b6a8818899ab
Merge: 8fd929e 56c7459
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Mon Nov 8 12:28:36 2010 +1000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	libsvm-2.91.patch
    	libsvm.spec
    	log
    	sources

 libsvm-2.91.patch            |  379 -----------------------------------------
 libsvm-3.0.javaDir.patch     |   59 +++++++
 libsvm-3.0.packageMain.patch |  114 +++++++++++++
 libsvm-3.0.pythonDir.patch   |   22 +++
 libsvm-3.0.svm-toy.patch     |   70 ++++++++
 libsvm-3.0.toolsDir.patch    |   30 ++++
 libsvm.spec                  |  319 +++++++++++++++++++-----------------
 log                          |  380 +++++++++++++++++++++---------------------
 sources                      |    2 +-
 9 files changed, 659 insertions(+), 716 deletions(-)
---
diff --cc libsvm.spec
index de2b2d0,7f4cc8d..3beca2d
--- a/libsvm.spec
+++ b/libsvm.spec
@@@ -38,31 -42,31 +42,31 @@@ Obsoletes: libsvm-java < 2.88-
  
  %description
  LIBSVM is an integrated software for support vector classification,
--(C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
--estimation (one-class SVM ). It supports multi-class classification.
++       (C-SVC, nu-SVC ), regression (epsilon-SVR, nu-SVR) and distribution
++       estimation (one-class SVM ). It supports multi-class classification.
  
--%package devel
--Summary:    Header file, object file, and source files of libsvm in C, C++ and Java
--Group:      Development/Libraries
--BuildRequires:  glibc-devel gawk
--Requires:       %{name} = %{version}-%{release}
++       %package devel
++       Summary:    Header file, object file, and source files of libsvm in C, C++ and Java
++       Group:      Development/Libraries
++       BuildRequires:  glibc-devel gawk
++       Requires:       %{name} = %{version}-%{release}
  
--%description devel
--Header file, object file of libsvm in C, C++ and Java.
--Install this package if you want to develop programs with libsvm.
++       %description devel
++       Header file, object file of libsvm in C, C++ and Java.
++       Install this package if you want to develop programs with libsvm.
  
  
--%package python
--Summary:    Python tools and interfaces for libsvm
--Group:      Development/Libraries
--BuildRequires:  python-devel >= 2.4 gawk
++       %package python
++       Summary:    Python tools and interfaces for libsvm
++       Group:      Development/Libraries
++       BuildRequires:  python-devel >= 2.4 gawk
  #gnuplot is required by easy.py
--Requires:       %{name} = %{version}-%{release}
++       Requires:       %{name} = %{version}-%{release}
  Requires:       gnuplot
  
  %description python
  Python tools and interfaces for libsvm.
--Install this package if you want to develop 
++Install this package if you want to develop
  programs with libsvm in Python.
  
  %ifnarch ppc ppc64
@@@ -78,158 -82,174 +82,174 @@@ Requires:       %{name} = %{version}-%{
  
  %description java
  Java tools and interfaces for libsvm.
--Install this package if you want to develop 
++Install this package if you want to develop
  programs with libsvm in Java.
  %endif
  
--%package svm-toy-gtk
- Summary:    GTK version of svm-toy (libsvm demostration program)
- Group:      Development/Libraries
- BuildRequires:  gtk2-devel
- BuildRequires:  desktop-file-utils
- Requires:       gtk2
- Requires:       %{name} = %{version}-%{release}
- 
- %description svm-toy-gtk
- svm-toy is a libsvm demostration program which has a gtk-GUI to 
- display the derived separating hyperplane.
- 
- %package svm-toy-qt
- Summary:    QT version of svm-toy (libsvm demostration program)
- Group:      Development/Libraries
- BuildRequires:  desktop-file-utils
- BuildRequires:  pkgconfig
- 
- BuildRequires:  qt4-devel
- Requires:       qt4
- Requires:       %{name} = %{version}-%{release}
- 
- %description svm-toy-qt
- svm-toy is a libsvm demostration program which has a qt-GUI to 
- display the derived separating hyperplane.
- 
- %prep
- %setup -q
- %patch0 -p0 -b .orig
- cp %{SOURCE1} ChangeLog
- cp %{SOURCE2} .
- cp %{SOURCE3} .
- cp %{SOURCE4} .
- cp %{SOURCE5} %{name}-svm-toy-gtk-48.png
- cp %{SOURCE5} %{name}-svm-toy-qt-48.png
- 
- 
- 
- %build
- %{__sed} -i 's/\r//' FAQ.html
- %{__sed} -i 's/\r//' ChangeLog
- make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
- mv python/README python/README-Python
- mv tools/README tools/README-Tools
- cp README java/README-Java
- cp README svm-toy/gtk
- cp README svm-toy/qt
- 
- 
- %install
- rm -rf $RPM_BUILD_ROOT
- make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
- ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
- rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
- mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
- cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
- cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
- mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
- cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
- cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
++    %package svm-toy-gtk
+ Summary:    GTK version of svm-toy (libsvm demonstration program)
 -Group:      Development/Libraries
 -BuildRequires:  gtk2-devel
 -BuildRequires:  desktop-file-utils
 -Requires:       gtk2
 -Requires:       %{name} = %{version}-%{release}
++    Group:      Development/Libraries
++    BuildRequires:  gtk2-devel
++    BuildRequires:  desktop-file-utils
++    Requires:       gtk2
++    Requires:       %{name} = %{version}-%{release}
+ 
 -%description svm-toy-gtk
 -svm-toy is a libsvm demonstration program which has a gtk-GUI to 
 -display the derived separating hyperplane.
++    %description svm-toy-gtk
++    svm-toy is a libsvm demonstration program which has a gtk-GUI to
++    display the derived separating hyperplane.
+ 
 -%package svm-toy-qt
++    %package svm-toy-qt
+ Summary:    QT version of svm-toy (libsvm demonstration program)
 -Group:      Development/Libraries
 -BuildRequires:  desktop-file-utils
 -BuildRequires:  pkgconfig
 -
 -BuildRequires:  qt4-devel
 -Requires:       qt4
 -Requires:       %{name} = %{version}-%{release}
 -
 -%description svm-toy-qt
 -svm-toy is a libsvm demonstration program which has a qt-GUI to 
 -display the derived separating hyperplane.
 -
 -%prep
 -%setup -q
 -%patch0 -p0 -b .packageMain
 -%patch1 -p0 -b .pythonDir
 -%patch2 -p0 -b .javaDir
 -%patch3 -p0 -b .svm-toy
 -%patch4 -p0 -b .toolsDir
 -cp %{SOURCE1} ChangeLog
 -cp %{SOURCE2} .
 -cp %{SOURCE3} .
 -cp %{SOURCE4} .
 -cp %{SOURCE5} %{name}-svm-toy-gtk-48.png
 -cp %{SOURCE5} %{name}-svm-toy-qt-48.png
 -
 -
 -
 -%build
 -%{__sed} -i 's/\r//' FAQ.html
 -%{__sed} -i 's/\r//' ChangeLog
 -make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
 -mv python/README python/README-Python
 -mv tools/README tools/README-Tools
 -cp README java/README-Java
 -cp README svm-toy/gtk
 -cp README svm-toy/qt
 -
 -
 -%install
 -rm -rf $RPM_BUILD_ROOT
 -make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
 -ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
 -rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 -cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 -cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
 -cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
 -cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
++    Group:      Development/Libraries
++    BuildRequires:  desktop-file-utils
++    BuildRequires:  pkgconfig
++
++    BuildRequires:  qt4-devel
++    Requires:       qt4
++    Requires:       %{name} = %{version}-%{release}
++
++    %description svm-toy-qt
++    svm-toy is a libsvm demonstration program which has a qt-GUI to
++    display the derived separating hyperplane.
++
++    %prep
++    %setup -q
++    %patch0 -p0 -b .packageMain
++    %patch1 -p0 -b .pythonDir
++    %patch2 -p0 -b .javaDir
++    %patch3 -p0 -b .svm-toy
++    %patch4 -p0 -b .toolsDir
++    cp %{SOURCE1} ChangeLog
++    cp %{SOURCE2} .
++    cp %{SOURCE3} .
++    cp %{SOURCE4} .
++    cp %{SOURCE5} %{name}-svm-toy-gtk-48.png
++    cp %{SOURCE5} %{name}-svm-toy-qt-48.png
++
++
++
++    %build
++    %{__sed} -i 's/\r//' FAQ.html
++    %{__sed} -i 's/\r//' ChangeLog
++    make all RPM_CFLAGS="$RPM_OPT_FLAGS" PYTHON_VERSION="%{pyver}" JAVAC="%{javac}" JAR="%{jar}" LIBDIR="%{_libdir}" MOC_PATH="%{moc_path}" NO_JAVA="%{no_java}"
++    mv python/README python/README-Python
++    mv tools/README tools/README-Tools
++    cp README java/README-Java
++    cp README svm-toy/gtk
++    cp README svm-toy/qt
++
++
++    %install
++    rm -rf $RPM_BUILD_ROOT
++    make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir} PYTHON_VERSION="%{pyver}" LIBSVM_VER="%{version}"  NO_JAVA="%{no_java}" JAVA_TARGET_DIR="${RPM_BUILD_ROOT}/%{_javadir}"
++    ln -sf %{name}.so.1 ${RPM_BUILD_ROOT}%{_libdir}/%{name}.so
++    rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/src
++    mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
++    cp %{name}-svm-toy-gtk-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
++    cp %{name}-svm-toy-qt-48.png $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
++    mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
++    cp %{name}-svm-toy-gtk.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
++    cp %{name}-svm-toy-qt.desktop $RPM_BUILD_ROOT/%{_datadir}/applications
  
  # [Bug 521194] Python: 'import libsvm' doesn't work
--echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
++    echo -e "# This file is not in the original libsvm tarball, but added for convenience of import libsvm.\n\
  # This file is released under BSD license, just like the rest of the package.\n"\
-- > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
++    > $RPM_BUILD_ROOT/%{libsvm_python_dir}/__init__.py
  
--desktop-file-install --delete-original --vendor=fedora \
--  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
--  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
--  ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \
++    desktop-file-install --delete-original --vendor=fedora \
++						    --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
++						    ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-gtk.desktop \
++						    ${RPM_BUILD_ROOT}/%{_datadir}/applications/%{name}-svm-toy-qt.desktop \
  
  
  
--%post -p /sbin/ldconfig
++						    %post -p /sbin/ldconfig
  
--%post svm-toy-gtk
--touch --no-create %{_datadir}/icons/hicolor
--if [ -x %{_bindir}/gtk-update-icon-cache ]; then
--  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
--fi
++						    %post svm-toy-gtk
++						    touch --no-create %{_datadir}/icons/hicolor
++						    if [ -x %{_bindir}/gtk-update-icon-cache ]; then
++						    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
++						    fi
  
  
--%postun -p /sbin/ldconfig
++						    %postun -p /sbin/ldconfig
  
--%postun svm-toy-gtk
--touch --no-create %{_datadir}/icons/hicolor
--if [ -x %{_bindir}/gtk-update-icon-cache ]; then
--  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
--fi
++						    %postun svm-toy-gtk
++						    touch --no-create %{_datadir}/icons/hicolor
++						    if [ -x %{_bindir}/gtk-update-icon-cache ]; then
++						    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
++						    fi
  
  
--%clean
--rm -rf $RPM_BUILD_ROOT
++						    %clean
++						    rm -rf $RPM_BUILD_ROOT
  
  
--%files
++    %files
  %defattr(-,root,root,-)
--%doc COPYRIGHT FAQ.html ChangeLog guide.pdf
--%{_bindir}/svm-predict
--%{_bindir}/svm-scale
--%{_bindir}/svm-train
--%dir %{_datadir}/%{name}
--%{_datadir}/%{name}/examples
- %{_libdir}/%{name}.so.1
 -%{_libdir}/%{name}.so.2
++    %doc COPYRIGHT FAQ.html ChangeLog guide.pdf
++    %{_bindir}/svm-predict
++    %{_bindir}/svm-scale
++    %{_bindir}/svm-train
++    %dir %{_datadir}/%{name}
++    %{_datadir}/%{name}/examples
++    %{_libdir}/%{name}.so.2
  
  
--%files devel
++    %files devel
  %defattr(-,root,root,-)
--%doc README
--%{_includedir}/%{name}/
--%{_libdir}/%{name}.so
++    %doc README
++    %{_includedir}/%{name}/
++    %{_libdir}/%{name}.so
  
--%files python
++    %files python
  %defattr(-,root,root,-)
--%doc python/README-Python tools/README-Tools
--%{libsvm_python_dir}
++    %doc python/README-Python tools/README-Tools
++    %{libsvm_python_dir}
  
--%ifnarch ppc ppc64
--%files java
++    %ifnarch ppc ppc64
++    %files java
  %defattr(-,root,root,-)
--%doc java/README-Java java/test_applet.html
--%{_javadir}/%{name}.jar
++    %doc java/README-Java java/test_applet.html
++    %{_javadir}/%{name}.jar
  #%{_datadir}/javadoc/%{name}-%{version}
--%endif
++    %endif
  
--%files svm-toy-gtk
++    %files svm-toy-gtk
  %defattr(-,root,root,-)
--%doc svm-toy/gtk/README
--%{_bindir}/svm-toy-gtk
--%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png
--%{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop
++    %doc svm-toy/gtk/README
++    %{_bindir}/svm-toy-gtk
++    %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-gtk-48.png
++    %{_datadir}/applications/fedora-%{name}-svm-toy-gtk.desktop
  
--%files svm-toy-qt
++    %files svm-toy-qt
  %defattr(-,root,root,-)
--%doc svm-toy/qt/README
--%{_bindir}/svm-toy-qt
--%{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png
--%{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop
--
--
--%changelog
- * Wed Apr 07 2010 Ding-Yi Chen <dchen at redhat.com> - 2.91-1
- - Fixed Bug 564887 - FTBFS libsvm-2.90-3.fc13
- - Upstream update:
-   * completely new python interface using ctype
-   * new way to set the print_string function
-   * Java: able to load model from a BufferedReader directly
-   * fix grid.py so -log2c can be run under python 2.6 or after
 -* Mon Nov 08 2010 Ding-Yi Chen <dchen at redhat.com> - 3.0-1
 -- Fixed the spelling errors of svm-toy-gtk and svm-toy-qt
 -- Upstream update:
 -  * Move model structure to svm.h
 -  * Two functions for freeing a model (content or the whole model)
 -  * QD from Qfloat to double (better precision because SSE on 64-bit machines less accurate than i387 on 32-bit
 -  * exit status for checkdata.py 
 -  * old python interface (swig) is removed
 -
 -* Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.91-2
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
 -* Wed Apr 07 2010 Ding-Yi Chen <dchen at redhat.com> - 2.91-1
 -- Fixed Bug 564887 - FTBFS libsvm-2.90-3.fc13
 -- Upstream update:
 -  * completely new python interface using ctype
 -  * new way to set the print_string function
 -  * Java: able to load model from a BufferedReader directly
 -  * fix grid.py so -log2c can be run under python 2.6 or after
++    %doc svm-toy/qt/README
++    %{_bindir}/svm-toy-qt
++    %{_datadir}/icons/hicolor/48x48/apps/%{name}-svm-toy-qt-48.png
++    %{_datadir}/applications/fedora-%{name}-svm-toy-qt.desktop
++
++
++    %changelog
++    * Mon Nov 08 2010 Ding-Yi Chen <dchen at redhat.com> - 3.0-1
++    - Fixed the spelling errors of svm-toy-gtk and svm-toy-qt
++    - Upstream update:
++    * Move model structure to svm.h
++* Two functions for freeing a model (content or the whole model)
++    * QD from Qfloat to double (better precision because SSE on 64-bit machines less accurate than i387 on 32-bit
++	    * exit status for checkdata.py
++	    * old python interface (swig) is removed
++
++	    * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 2.91-2
++	    - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
++
++	    * Wed Apr 07 2010 Ding-Yi Chen <dchen at redhat.com> - 2.91-1
++	    - Fixed Bug 564887 - FTBFS libsvm-2.90-3.fc13
++	    - Upstream update:
++	    * completely new python interface using ctype
++	    * new way to set the print_string function
++	    * Java: able to load model from a BufferedReader directly
++	    * fix grid.py so -log2c can be run under python 2.6 or after
  
  * Thu Nov 05 2009 Ding-Yi Chen <dchen at redhat.com> - 2.90-2
  - Obsoletes libsvm-java for ppc and ppc64.
@@@ -250,12 -270,12 +270,12 @@@
  
  * Wed Sep 16 2009 Ding-Yi Chen <dchen at redhat.com> - 2.89-3
  - Fix the building for EL-5
--  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded, 
++  Note that libsvm-java on ppc and ppc64 for EL-5 is excluded,
    as java-1.6.0-openjdk-devel for them do not exist yet.
  - Change the Java buildrequires from java-sdk to java-1.6.0-openjdk-devel
  - Fix [Bug 521194] Python: 'import libsvm' doesn't work.
     By adding __init__.py to libsvm_python_dir
--  
++
  * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.89-2
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
  
@@@ -263,7 -283,7 +283,7 @@@
  - Upstream Update to 2.89:
    + reduce input/loading time of svm-train/svm-predict by half
    + pointer function so users can specify their own outputs
--  + remove info_flush() 
++  + remove info_flush()
    + a extern variable libsvm_version
    + svm-train -q option (disable outputs)
    + svm-scale: warning if more nonzero produced
@@@ -272,7 -292,7 +292,7 @@@
  
  * Mon Nov 10 2008 Ding-Yi Chen <dchen at redhat.com> - 2.88-2
  - Fix java BuildRequire and Build
--- javadoc have been removed because ppc and ppc64 do not have a 
++- javadoc have been removed because ppc and ppc64 do not have a
    suitable package to build javadoc in F-8, nor does javadoc
    provide much useful information.
  
@@@ -302,7 -322,7 +322,7 @@@
  * Thu Apr 29 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-13
  - Fix svm-toy-qt clear button does not clear.
    (from Hsiang-Fu Yu in National Taiwan University)
-- 
++
  
  * Thu Apr 3 2008 Ding-Yi Chen <dchen at redhat.com> - 2.86-12
  - Correct changelog date
@@@ -317,10 -337,10 +337,10 @@@
  - Upstream update to 2.86
    - svm-scale for java
    - version number in svm.h and svm.m4
--  - rename svmtrain.exe to svm-train.exe 
++  - rename svmtrain.exe to svm-train.exe
    - python: while 1 --> while True, Popen -> call
    - show best parameters on the contour of grid.py
--- LIBSVM_VER_MAJOR and LIBSVM_VER_MINOR are defined in libsvm.spec instead in 
++- LIBSVM_VER_MAJOR and LIBSVM_VER_MINOR are defined in libsvm.spec instead in
  
  * Tue Mar 11 2008 Ding-Yi Chen <dchen at redhat.com> - 2.85-6
  - Fix build error.
@@@ -359,7 -379,7 +379,7 @@@
  - Add gnuplot dependency for libsvm-python, as tools/easy.py needs it.
  
  * Mon Dec 03 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-7
--- [Bug 254091] Review Request: libsvm - A Library for Support Vector Machines (Comment #12) 
++- [Bug 254091] Review Request: libsvm - A Library for Support Vector Machines (Comment #12)
  
  * Thu Sep 26 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-6
  - Add defattr to each subpackage
@@@ -387,3 -407,3 +407,4 @@@
  * Fri Aug 17 2007 Ding-Yi Chen <dchen at redhat.com> - 2.84-0
  - initial packaging
  
++
diff --cc log
index 607ab9d,9d41631..2fbab2c
--- a/log
+++ b/log
@@@ -1,187 -1,192 +1,193 @@@
--1.04: 2000/6/17, add "load" button to svm-toy. README 
--file updated.
--
--2.0: 2000/8, major updates. Include nu-svm, one-class svm, and svr
--
--2.01: 2000/9/22, correct the calculation of obj value and number of bounded support vectors
--
--2.02: 2000/9/29, replace b^2/2 newsvm to regular nu svm.
--
--2.03: 2000/10/24 some improvements on the computational speed
--
--2.1: 2000/12/19 Java version included, regression demonstrated in svm-toy
--
--2.2: 2001/1/16 multi-class classification, nu-SVR, remove epsilon_a
--
--2.3: 2001/3/15 c+-, cross validation, fix some minor bugs
--
--2.31: 2001/4/12 fix one bug on one-class SVM, use float for Cache
--
--2.32: 2001/9/23 
--	1. max line number of svm-scale now dynamic
--	2. gcc 3.0 problem: now g++ always used
--	3. java code in a "libsvm" package
--	4. avoid a problem when compiled with Borland C++ builder
--
--2.33: 2001/12/1
--	Python interface added
--
--2.34: 2002/6/15
--	Add the subroutine svm_check_parameter in svm.cpp
--	--> better error handling
--	fix bug of python interface for handling different weights
--	fix bug of cross validation in svm-train.c
--
--2.35: 2002/6/16
--	libsvm.jar was not compiled correctly in 2.34
--
--2.36: 2002/8/4
--	grid.py added: contour plot of CV accuracy
--	fix several bugs
--
--2.4:  2003/4/1
--	svm.cpp
--		non-psd kernel using max(...,0) in svm.cpp
--	python interface
--		python interface bug (nu-svm)
--	grid.py
--		-log2c and -log2c for grid.py
--	        output current best
--		coarse grid as default (2)
--		ssh for grid.py 
--	improvements of scaling 
--
--2.5: 2003/11/13
--	subroutines for accessing decision values and number of labels. 
--		for svm.cpp, java, and  python interface
--	fix bug of svm-scale.c (about -r and -s factors)
--	use fscanf but not sscanf in svm-predict.c (faster)
--	makefile for windows
--	add "using namespace std;" in some .java files
--	improve easy.py: output cv rate, error messages printed
--		better checking
--	better python interface example svm_test.py
--	and some minor updates
--
--2.6: 2004/04/01
--	Probability estimates for classification/regression 
--	Python interface: use swig 1.3 instead of 1.1
--	Cross validation becomes a library subroutine
--	A few minor corrections: (not completely listed)
--		more interface functions such as getting svm_type
--		print nu only when Cp=Cn
--		floor division in python interface
--
--2.7: 2004/11/10
--	Stratified cross validation
--	Better faq
--	Scaling: support storing the factor of y
--	A few minor updates:
--		class QMatrix added
--		improve the use of easy.py and grid.py on windows 
--		grid.py: same CV and same g: use smaller C
--		sparse input for python interface
--		working set selection: < to <=
--
--2.71: 2004/11/20
--	fix a java bug introduced from 2.6 to 2.7
--
--2.8: 2005/04/01
--	new working set selection via second order information
--	fix minor changes/corrections:
--		problem when cache size less than two kernel columns
--		-v #data -> stratified CV is not loo -> ensure loo is done
--		problem of typing "svm-train -c" only
--		problem of "svm-train -n 1 -s 3 ..."
--		python interface makefile: -fPIC for 32/64bit
--		color change in svmtoy
--		makefile in building QT svmtoy
--
--2.81: 2005/11/20
--	add a python script subset.py for subsampling
--	slightly modify the working set so it's exact the same as the paper
--	default cache size to 100 MB
--
--2.82: 2006/04/01
--	precomputed kernel
--	directly implement a fast powi() function
--	poly degree double to int
--	minor corrections:
--		java code for CV
--2.83: 2006/11/17
--	Fix the bug of -t 3
--	better checking load/save in svm-train.c/svm-predict.c/svm.cpp
--	remove redundant var pos in svm_predict_values (thanks to Albert Strasheim)
--	Better descriptions in README for the precomputed kernel
--
--2.84: 2007/04/01
--	Improve the shrinking code: faster for some cases
--	Code more 64-bit friendly: allow large -m
--	In Solver, b is replaced by p
--	Subroutine max_violating_pair removed. Things are directly
--	written in do_shrinking().
--	Modify do_shrinking() so variable names are the same as libsvm
--	document
--
--2.85: 2007/11/6
--	fix minor memory leak in svm-predict.c
--	add tools/checkdata.py 
--	java to 1.5
--	Makefile: CXX?
--	Makefile.win: avoid warning from .net 2005
--	avoid warning of gcc 4.2
--	sigma 0.001 to 1e-12; in Newton direction of prob output
--	2 * (long int) l avoid warning of old Visual C++
--	grid.py: avoid gnuplot problem on windows
--
--2.86: 2008/04/01
--	svm-scale for java
--	version number in svm.h and svm.m4
--	rename svmtrain.exe to svm-train.exe 
--	python: while 1 --> while True, Popen -> call
--	show best parameters on the contour of grid.py
--
--2.87: 2008/10/13
--	svm-toy/qt updated to qt4 from qt3
--	fix a bug in svm-scale.c
--		max feature index of -r file is considered
--	Makefile: add make lib; add -Wconversion and -fPIC in Makefile
--	Add "rb" in load_model of svm.cpp
--	Simplify do_shrinking of svm.cpp
--	Change the order of loops in reconstrict_gradient of svm.cpp
--		save the number of kernel evaluations
--	Add python/setup.py
--
--2.88: 2008/10/30
--	better gradient reconstructions
--	issue a warning	when -h 0 may be faster
--
--2.89: 2009/04/01
--	reduce input/loading time of svm-train/svm-predict by half
--	pointer function so users can specify their own outputs
--	remove info_flush() 
--	a extern variable libsvm_version
--	svm-train -q option (disable outputs)
--	svm-scale: warning if more nonzero produced
--	easy.py: popel.communiate() to avoid some deadlock (if lots of
--		outputs when #classes is large)
--
--2.9: 2009/11/1
--	tools/*.py can be run under python 3.0
--	svm_set_quiet() in python interface to disable outputs
--	check gamma < 0
--	internal functions to be static
--
--2.91: 2010/04/01
--	completely new python interface using ctype
--	new way to set the print_string function
--	Java: able to load model from a BufferedReader directly
--	fix grid.py so -log2c can be run under python 2.6 or after
--
- ------------------
- 
- Future plan:
- ?.?:
- 	old python interface is removed
- 
- 	update make.m of matlab interface to use max(...)
 -3.0: 2010/09/13
 -	Move model structure to svm.h
 -	Two functions for freeing a model (content or the whole model)
 -	QD from Qfloat to double (better precision because SSE on 64-bit machines less accurate than i387 on 32-bit
 -	exit status for checkdata.py 
 -	old python interface (swig) is removed
 -------------------
 -
 -Future plan:
 -?.?:
 -	merge matlab interface to core libsvm
 -	update make.m of matlab interface to use max(...)
++1.04: 2000/6/17, add "load" button to svm-toy. README
++file updated.
++
++2.0: 2000/8, major updates. Include nu-svm, one-class svm, and svr
++
++2.01: 2000/9/22, correct the calculation of obj value and number of bounded support vectors
++
++2.02: 2000/9/29, replace b^2/2 newsvm to regular nu svm.
++
++2.03: 2000/10/24 some improvements on the computational speed
++
++2.1: 2000/12/19 Java version included, regression demonstrated in svm-toy
++
++2.2: 2001/1/16 multi-class classification, nu-SVR, remove epsilon_a
++
++2.3: 2001/3/15 c+-, cross validation, fix some minor bugs
++
++2.31: 2001/4/12 fix one bug on one-class SVM, use float for Cache
++
++2.32: 2001/9/23
++1. max line number of svm-scale now dynamic
++2. gcc 3.0 problem: now g++ always used
++3. java code in a "libsvm" package
++4. avoid a problem when compiled with Borland C++ builder
++
++2.33: 2001/12/1
++Python interface added
++
++2.34: 2002/6/15
++Add the subroutine svm_check_parameter in svm.cpp
++--> better error handling
++fix bug of python interface for handling different weights
++fix bug of cross validation in svm-train.c
++
++2.35: 2002/6/16
++libsvm.jar was not compiled correctly in 2.34
++
++2.36: 2002/8/4
++grid.py added: contour plot of CV accuracy
++fix several bugs
++
++2.4:  2003/4/1
++svm.cpp
++non-psd kernel using max(...,0) in svm.cpp
++    python interface
++python interface bug (nu-svm)
++    grid.py
++    -log2c and -log2c for grid.py
++    output current best
++coarse grid as default (2)
++    ssh for grid.py
++    improvements of scaling
++
++    2.5: 2003/11/13
++    subroutines for accessing decision values and number of labels.
++    for svm.cpp, java, and  python interface
++    fix bug of svm-scale.c (about -r and -s factors)
++use fscanf but not sscanf in svm-predict.c (faster)
++    makefile for windows
++    add "using namespace std;" in some .java files
++    improve easy.py: output cv rate, error messages printed
++    better checking
++    better python interface example svm_test.py
++    and some minor updates
++
++    2.6: 2004/04/01
++    Probability estimates for classification/regression
++    Python interface: use swig 1.3 instead of 1.1
++    Cross validation becomes a library subroutine
++A few minor corrections: (not completely listed)
++    more interface functions such as getting svm_type
++    print nu only when Cp=Cn
++    floor division in python interface
++
++    2.7: 2004/11/10
++    Stratified cross validation
++    Better faq
++    Scaling: support storing the factor of y
++    A few minor updates:
++    class QMatrix added
++    improve the use of easy.py and grid.py on windows
++    grid.py: same CV and same g: use smaller C
++    sparse input for python interface
++    working set selection: < to <=
++
++    2.71: 2004/11/20
++    fix a java bug introduced from 2.6 to 2.7
++
++    2.8: 2005/04/01
++    new working set selection via second order information
++    fix minor changes/corrections:
++    problem when cache size less than two kernel columns
++    -v #data -> stratified CV is not loo -> ensure loo is done
++    problem of typing "svm-train -c" only
++    problem of "svm-train -n 1 -s 3 ..."
++    python interface makefile: -fPIC for 32/64bit
++    color change in svmtoy
++    makefile in building QT svmtoy
++
++    2.81: 2005/11/20
++    add a python script subset.py for subsampling
++    slightly modify the working set so it's exact the same as the paper
++    default cache size to 100 MB
++
++    2.82: 2006/04/01
++    precomputed kernel
++    directly implement a fast powi() function
++    poly degree double to int
++    minor corrections:
++    java code for CV
++    2.83: 2006/11/17
++    Fix the bug of -t 3
++    better checking load/save in svm-train.c/svm-predict.c/svm.cpp
++remove redundant var pos in svm_predict_values (thanks to Albert Strasheim)
++    Better descriptions in README for the precomputed kernel
++
++    2.84: 2007/04/01
++    Improve the shrinking code: faster for some cases
++    Code more 64-bit friendly: allow large -m
++    In Solver, b is replaced by p
++    Subroutine max_violating_pair removed. Things are directly
++    written in do_shrinking().
++    Modify do_shrinking() so variable names are the same as libsvm
++    document
++
++    2.85: 2007/11/6
++    fix minor memory leak in svm-predict.c
++    add tools/checkdata.py
++    java to 1.5
++    Makefile: CXX?
++    Makefile.win: avoid warning from .net 2005
++    avoid warning of gcc 4.2
++    sigma 0.001 to 1e-12; in Newton direction of prob output
++    2 * (long int) l avoid warning of old Visual C++
++    grid.py: avoid gnuplot problem on windows
++
++    2.86: 2008/04/01
++    svm-scale for java
++    version number in svm.h and svm.m4
++    rename svmtrain.exe to svm-train.exe
++    python: while 1 --> while True, Popen -> call
++    show best parameters on the contour of grid.py
++
++    2.87: 2008/10/13
++    svm-toy/qt updated to qt4 from qt3
++    fix a bug in svm-scale.c
++    max feature index of -r file is considered
++    Makefile: add make lib; add -Wconversion and -fPIC in Makefile
++    Add "rb" in load_model of svm.cpp
++    Simplify do_shrinking of svm.cpp
++    Change the order of loops in reconstrict_gradient of svm.cpp
++    save the number of kernel evaluations
++    Add python/setup.py
++
++    2.88: 2008/10/30
++    better gradient reconstructions
++    issue a warning	when -h 0 may be faster
++
++    2.89: 2009/04/01
++    reduce input/loading time of svm-train/svm-predict by half
++    pointer function so users can specify their own outputs
++remove info_flush()
++    a extern variable libsvm_version
++svm-train -q option (disable outputs)
++    svm-scale: warning if more nonzero produced
++    easy.py: popel.communiate() to avoid some deadlock (if lots of
++	    outputs when #classes is large)
++
++    2.9: 2009/11/1
++    tools/*.py can be run under python 3.0
++	   svm_set_quiet() in python interface to disable outputs
++	   check gamma < 0
++	   internal functions to be static
++
++	   2.91: 2010/04/01
++	   completely new python interface using ctype
++	   new way to set the print_string function
++	   Java: able to load model from a BufferedReader directly
++	   fix grid.py so -log2c can be run under python 2.6 or after
++
++	   3.0: 2010/09/13
++	   Move model structure to svm.h
++	   Two functions for freeing a model (content or the whole model)
++	   QD from Qfloat to double (better precision because SSE on 64-bit machines less accurate than i387 on 32-bit
++	   exit status for checkdata.py
++	   old python interface (swig) is removed
++	   ------------------
++
++	   Future plan:
++	   ?.?:
++	   merge matlab interface to core libsvm
++	   update make.m of matlab interface to use max(...)
++


More information about the scm-commits mailing list