rpms
/
libsvm
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix svm-toy-qt clear buttom problem

Browse Source
epel8
Ding-Yi Chen 17 years ago
parent 8915963aa3
commit 61c60df60a
2 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File

42
libsvm-2.86.patch
Unescape View File

@ -1,9 +1,8 @@
diff -up ./FAQ.html.orig ./FAQ.html diff -up ./FAQ.html.orig ./FAQ.html
diff -up ./java/libsvm/svm.java.orig ./java/libsvm/svm.java diff -up ./java/libsvm/svm.java.orig ./java/libsvm/svm.java
diff -up ./java/libsvm/svm.m4.orig ./java/libsvm/svm.m4
diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
--- ./java/libsvm/svm_model.java.orig 2007-01-13 08:23:39.000000000 +1000 --- ./java/libsvm/svm_model.java.orig 2007-01-13 08:23:39.000000000 +1000
+++ ./java/libsvm/svm_model.java 2008-04-01 16:17:52.000000000 +1000 +++ ./java/libsvm/svm_model.java 2008-04-29 15:48:00.000000000 +1000
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
package libsvm; package libsvm;
public class svm_model implements java.io.Serializable public class svm_model implements java.io.Serializable
@ -14,7 +13,7 @@ diff -up ./java/libsvm/svm_model.java.orig ./java/libsvm/svm_model.java
int l; // total #SV int l; // total #SV
diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
--- ./java/libsvm/svm_node.java.orig 2003-10-11 22:30:47.000000000 +1000 --- ./java/libsvm/svm_node.java.orig 2003-10-11 22:30:47.000000000 +1000
+++ ./java/libsvm/svm_node.java 2008-04-01 16:17:52.000000000 +1000 +++ ./java/libsvm/svm_node.java 2008-04-29 15:48:00.000000000 +1000
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
package libsvm; package libsvm;
public class svm_node implements java.io.Serializable public class svm_node implements java.io.Serializable
@ -25,7 +24,7 @@ diff -up ./java/libsvm/svm_node.java.orig ./java/libsvm/svm_node.java
} }
diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
--- ./java/libsvm/svm_parameter.java.orig 2006-03-04 01:44:14.000000000 +1000 --- ./java/libsvm/svm_parameter.java.orig 2006-03-04 01:44:14.000000000 +1000
+++ ./java/libsvm/svm_parameter.java 2008-04-01 16:17:52.000000000 +1000 +++ ./java/libsvm/svm_parameter.java 2008-04-29 15:48:00.000000000 +1000
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
package libsvm; package libsvm;
public class svm_parameter implements Cloneable,java.io.Serializable public class svm_parameter implements Cloneable,java.io.Serializable
@ -36,7 +35,7 @@ diff -up ./java/libsvm/svm_parameter.java.orig ./java/libsvm/svm_parameter.java
public static final int NU_SVC = 1; public static final int NU_SVC = 1;
diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
--- ./java/libsvm/svm_problem.java.orig 2003-10-11 22:30:47.000000000 +1000 --- ./java/libsvm/svm_problem.java.orig 2003-10-11 22:30:47.000000000 +1000
+++ ./java/libsvm/svm_problem.java 2008-04-01 16:17:52.000000000 +1000 +++ ./java/libsvm/svm_problem.java 2008-04-29 15:48:00.000000000 +1000
@@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
package libsvm; package libsvm;
public class svm_problem implements java.io.Serializable public class svm_problem implements java.io.Serializable
@ -47,7 +46,7 @@ diff -up ./java/libsvm/svm_problem.java.orig ./java/libsvm/svm_problem.java
public svm_node[][] x; public svm_node[][] x;
diff -up ./java/Makefile.orig ./java/Makefile diff -up ./java/Makefile.orig ./java/Makefile
--- ./java/Makefile.orig 2007-11-11 22:17:30.000000000 +1000 --- ./java/Makefile.orig 2007-11-11 22:17:30.000000000 +1000
+++ ./java/Makefile 2008-04-01 16:17:52.000000000 +1000 +++ ./java/Makefile 2008-04-29 15:48:00.000000000 +1000
@@ -3,13 +3,22 @@ FILES = libsvm/svm.class libsvm/svm_mode @@ -3,13 +3,22 @@ FILES = libsvm/svm.class libsvm/svm_mode
libsvm/svm_parameter.class libsvm/svm_problem.class \ libsvm/svm_parameter.class libsvm/svm_problem.class \
svm_train.class svm_predict.class svm_toy.class svm_scale.class svm_train.class svm_predict.class svm_toy.class svm_scale.class
@ -103,7 +102,7 @@ diff -up ./java/svm_predict.java.orig ./java/svm_predict.java
diff -up ./java/svm_scale.java.orig ./java/svm_scale.java diff -up ./java/svm_scale.java.orig ./java/svm_scale.java
diff -up ./java/svm_toy.java.orig ./java/svm_toy.java diff -up ./java/svm_toy.java.orig ./java/svm_toy.java
--- ./java/svm_toy.java.orig 2007-07-01 23:02:51.000000000 +1000 --- ./java/svm_toy.java.orig 2007-07-01 23:02:51.000000000 +1000
+++ ./java/svm_toy.java 2008-04-01 16:17:52.000000000 +1000 +++ ./java/svm_toy.java 2008-04-29 15:48:00.000000000 +1000
@@ -6,7 +6,7 @@ import java.awt.event.*; @@ -6,7 +6,7 @@ import java.awt.event.*;
import java.io.*; import java.io.*;
@ -124,7 +123,7 @@ diff -up ./java/svm_toy.java.orig ./java/svm_toy.java
diff -up ./java/svm_train.java.orig ./java/svm_train.java diff -up ./java/svm_train.java.orig ./java/svm_train.java
diff -up ./java/test_applet.html.orig ./java/test_applet.html diff -up ./java/test_applet.html.orig ./java/test_applet.html
--- ./java/test_applet.html.orig 2003-07-12 14:06:55.000000000 +1000 --- ./java/test_applet.html.orig 2003-07-12 14:06:55.000000000 +1000
+++ ./java/test_applet.html 2008-04-01 16:17:52.000000000 +1000 +++ ./java/test_applet.html 2008-04-29 15:48:00.000000000 +1000
@@ -1 +1,3 @@ @@ -1 +1,3 @@
-<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET> -<APPLET code="svm_toy.class" archive="libsvm.jar" width=300 height=350></APPLET>
+<html> +<html>
@ -132,7 +131,7 @@ diff -up ./java/test_applet.html.orig ./java/test_applet.html
+</html> +</html>
diff -up ./Makefile.orig ./Makefile diff -up ./Makefile.orig ./Makefile
--- ./Makefile.orig 2007-10-14 16:29:12.000000000 +1000 --- ./Makefile.orig 2007-10-14 16:29:12.000000000 +1000
+++ ./Makefile 2008-04-01 16:21:40.000000000 +1000 +++ ./Makefile 2008-04-29 15:48:00.000000000 +1000
@@ -1,15 +1,109 @@ @@ -1,15 +1,109 @@
CXX? = g++ CXX? = g++
CFLAGS = -Wall -O3 CFLAGS = -Wall -O3
@ -256,7 +255,7 @@ diff -up ./Makefile.orig ./Makefile
diff -up ./python/cross_validation.py.orig ./python/cross_validation.py diff -up ./python/cross_validation.py.orig ./python/cross_validation.py
diff -up ./python/Makefile.orig ./python/Makefile diff -up ./python/Makefile.orig ./python/Makefile
--- ./python/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 --- ./python/Makefile.orig 2007-10-14 16:29:12.000000000 +1000
+++ ./python/Makefile 2008-04-01 16:17:52.000000000 +1000 +++ ./python/Makefile 2008-04-29 15:48:00.000000000 +1000
@@ -2,9 +2,16 @@ CXX? = g++ @@ -2,9 +2,16 @@ CXX? = g++
SWIG ?= swig SWIG ?= swig
@ -317,12 +316,13 @@ diff -up ./python/svmc_wrap.c.orig ./python/svmc_wrap.c
diff -up ./python/svm.py.orig ./python/svm.py diff -up ./python/svm.py.orig ./python/svm.py
diff -up ./python/svm_test.py.orig ./python/svm_test.py diff -up ./python/svm_test.py.orig ./python/svm_test.py
diff -up ./python/test_cross_validation.py.orig ./python/test_cross_validation.py diff -up ./python/test_cross_validation.py.orig ./python/test_cross_validation.py
diff -up ./svm.cpp.orig ./svm.cpp
diff -up ./svm.h.orig ./svm.h diff -up ./svm.h.orig ./svm.h
diff -up ./svm-predict.c.orig ./svm-predict.c diff -up ./svm-predict.c.orig ./svm-predict.c
diff -up ./svm-scale.c.orig ./svm-scale.c diff -up ./svm-scale.c.orig ./svm-scale.c
diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp diff -up ./svm-toy/gtk/callbacks.cpp.orig ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.orig 2008-04-01 16:55:09.000000000 +1000 --- ./svm-toy/gtk/callbacks.cpp.orig 2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp 2008-04-01 17:04:12.000000000 +1000 +++ ./svm-toy/gtk/callbacks.cpp 2008-04-29 15:48:00.000000000 +1000
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>
@ -337,7 +337,7 @@ diff -up ./svm-toy/gtk/interface.h.orig ./svm-toy/gtk/interface.h
diff -up ./svm-toy/gtk/main.c.orig ./svm-toy/gtk/main.c diff -up ./svm-toy/gtk/main.c.orig ./svm-toy/gtk/main.c
diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 --- ./svm-toy/gtk/Makefile.orig 2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/gtk/Makefile 2008-04-01 16:17:52.000000000 +1000 +++ ./svm-toy/gtk/Makefile 2008-04-29 15:48:00.000000000 +1000
@@ -1,22 +1,28 @@ @@ -1,22 +1,28 @@
CC? = gcc CC? = gcc
CXX? = g++ CXX? = g++
@ -379,7 +379,7 @@ diff -up ./svm-toy/gtk/Makefile.orig ./svm-toy/gtk/Makefile
+ rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o + rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.orig 2007-10-14 16:29:12.000000000 +1000 --- ./svm-toy/qt/Makefile.orig 2007-10-14 16:29:12.000000000 +1000
+++ ./svm-toy/qt/Makefile 2008-04-03 15:23:17.000000000 +1000 +++ ./svm-toy/qt/Makefile 2008-04-29 16:29:15.000000000 +1000
@@ -1,19 +1,50 @@ @@ -1,19 +1,50 @@
CXX? = g++ CXX? = g++
-CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT -CFLAGS = -Wall -O3 -DQT_THREAD_SUPPORT
@ -392,7 +392,7 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
+CFLAGS = -Wall -O3 +CFLAGS = -Wall -O3
+#LIBDIR?=/usr/lib64 +#LIBDIR?=/usr/lib64
+#QT4_DIR= +#QT4_DIR=
+QT4_DIR:= $(shell if [ -e ${LIBDIR}/qt4 ]; then echo ${LIBDIR}/qt4; fi) +QT4_DIR:= $(shell if [ -e ${LIBDIR}/pkgconfig/Qt3Support.pc ]; then echo ${LIBDIR}/qt4; fi)
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o -svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
- $(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt - $(CXX) -I$(INCLUDE) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy -L$(LIB) -lqt-mt
@ -446,15 +446,16 @@ diff -up ./svm-toy/qt/Makefile.orig ./svm-toy/qt/Makefile
- rm -f *~ svm-toy svm-toy.moc ../../svm.o - rm -f *~ svm-toy svm-toy.moc ../../svm.o
+ rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o svm-toy.new.cpp + rm -f *~ svm-toy-qt svm-toy.moc ../../svm.o svm-toy.new.cpp
diff -up ./svm-toy/qt/svm-toy.cpp.orig ./svm-toy/qt/svm-toy.cpp diff -up ./svm-toy/qt/svm-toy.cpp.orig ./svm-toy/qt/svm-toy.cpp
--- ./svm-toy/qt/svm-toy.cpp.orig 2008-04-01 16:55:51.000000000 +1000 --- ./svm-toy/qt/svm-toy.cpp.orig 2006-03-04 17:40:12.000000000 +1000
+++ ./svm-toy/qt/svm-toy.cpp 2008-04-02 14:01:47.000000000 +1000 +++ ./svm-toy/qt/svm-toy.cpp 2008-04-29 16:13:32.000000000 +1000
@@ -67,14 +67,15 @@ private: @@ -67,14 +67,15 @@ private:
void clear_all() void clear_all()
{ {
point_list.clear(); point_list.clear();
- buffer.fill(black); - buffer.fill(black);
- paintEvent(NULL);
+ buffer.fill(Qt::black); + buffer.fill(Qt::black);
paintEvent(NULL); + repaint(FALSE);
} }
void draw_point(const point& p) void draw_point(const point& p)
{ {
@ -551,11 +552,12 @@ diff -up ./svm-toy/qt/svm-toy.cpp.orig ./svm-toy/qt/svm-toy.cpp
} }
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
diff -up ./svm-toy/windows/svm-toy.cpp.orig ./svm-toy/windows/svm-toy.cpp
diff -up ./svm-train.c.orig ./svm-train.c diff -up ./svm-train.c.orig ./svm-train.c
diff -up ./tools/checkdata.py.orig ./tools/checkdata.py diff -up ./tools/checkdata.py.orig ./tools/checkdata.py
diff -up ./tools/easy.py.orig ./tools/easy.py diff -up ./tools/easy.py.orig ./tools/easy.py
--- ./tools/easy.py.orig 2008-02-10 22:12:43.000000000 +1000 --- ./tools/easy.py.orig 2008-02-10 22:12:43.000000000 +1000
+++ ./tools/easy.py 2008-04-01 16:17:52.000000000 +1000 +++ ./tools/easy.py 2008-04-29 15:48:00.000000000 +1000
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
import sys import sys
@ -581,7 +583,7 @@ diff -up ./tools/easy.py.orig ./tools/easy.py
# example for windows # example for windows
diff -up ./tools/grid.py.orig ./tools/grid.py diff -up ./tools/grid.py.orig ./tools/grid.py
--- ./tools/grid.py.orig 2008-03-10 00:33:09.000000000 +1000 --- ./tools/grid.py.orig 2008-03-10 00:33:09.000000000 +1000
+++ ./tools/grid.py 2008-04-01 16:17:52.000000000 +1000 +++ ./tools/grid.py 2008-04-29 15:48:00.000000000 +1000
@@ -11,7 +11,7 @@ from subprocess import * @@ -11,7 +11,7 @@ from subprocess import *
is_win32 = (sys.platform == 'win32') is_win32 = (sys.platform == 'win32')

7
libsvm.spec
Unescape View File

@ -1,6 +1,6 @@
Name: libsvm Name: libsvm
Version: 2.86 Version: 2.86
Release: 12%{?dist} Release: 13%{?dist}
Summary: A Library for Support Vector Machines Summary: A Library for Support Vector Machines
Group: Development/Libraries Group: Development/Libraries
@ -203,6 +203,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Thu Apr 29 2008 Ding-Yi Chen <dchen@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@redhat.com> - 2.86-12 * Thu Apr 3 2008 Ding-Yi Chen <dchen@redhat.com> - 2.86-12
- Correct changelog date - Correct changelog date

Write Preview
Loading…
Cancel
Save