| 修订版 | 8 (tree) |
|---|---|
| 时间 | 2010-04-19 14:00:21 |
| 作者 | (del#42041) |
fixed runtime exceptions
test/Makefile.in (diff)
test/test_filter.cc (diff) src/Makefile.in (diff) src/filter.cc (diff)
src/filter.h (diff) src/Makefile (diff)| @@ -3,7 +3,7 @@ | ||
| 3 | 3 | SRCS=test_particle.cc test_particles.cc test_filter.cc |
| 4 | 4 | OBJS=$(SRCS:.cc=.o) |
| 5 | 5 | TARGETS=$(SRCS:.cc=) |
| 6 | -CFLAGS=-I/usr/local/include/cutter -I. -I../src -g | |
| 6 | +CFLAGS=-I/usr/local/include/cutter -I. -I../src -g -Wall | |
| 7 | 7 | LDFLAGS=@LDFLAGS@ -L. -L../src -lparticle -lcppcutter |
| 8 | 8 | all: $(TARGETS) |
| 9 | 9 |
| @@ -4,7 +4,7 @@ | ||
| 4 | 4 | #include <filter.h> |
| 5 | 5 | using namespace std; |
| 6 | 6 | |
| 7 | -static Particles func(Particles &p) | |
| 7 | +Particles func(Particles &p) | |
| 8 | 8 | { |
| 9 | 9 | // Particles a(5,3); |
| 10 | 10 | // Particles a; |
| @@ -30,7 +30,7 @@ | ||
| 30 | 30 | a.createInitialParticles(); |
| 31 | 31 | a.dump_predict_particles(); |
| 32 | 32 | a.set_state_func(&func); |
| 33 | - Particles b; | |
| 33 | + Particles b(5,3); | |
| 34 | 34 | a.get_next_state(b); |
| 35 | 35 | } |
| 36 | 36 | } |
| @@ -5,7 +5,7 @@ | ||
| 5 | 5 | HEADS=$(SRCS:.cc=.h) |
| 6 | 6 | TARGETS=libparticle.so |
| 7 | 7 | AR=@AR@ |
| 8 | -CFLAGS=-I. -g | |
| 8 | +CFLAGS=-I. -g -Wall | |
| 9 | 9 | all: $(TARGETS) |
| 10 | 10 | |
| 11 | 11 | libparticle.so: $(OBJS) |
| @@ -9,16 +9,18 @@ | ||
| 9 | 9 | } |
| 10 | 10 | Filter::~Filter() |
| 11 | 11 | { |
| 12 | -// if(x) delete x; | |
| 12 | + if(x) delete x; | |
| 13 | 13 | } |
| 14 | 14 | |
| 15 | 15 | bool Filter::setNumber(int n) |
| 16 | 16 | { |
| 17 | 17 | number = n; |
| 18 | + return(true); | |
| 18 | 19 | } |
| 19 | 20 | bool Filter::setDimension(int d) |
| 20 | 21 | { |
| 21 | 22 | dimension = d; |
| 23 | + return(true); | |
| 22 | 24 | } |
| 23 | 25 | bool Filter::createInitialParticles() |
| 24 | 26 | { |
| @@ -36,9 +38,10 @@ | ||
| 36 | 38 | state_func = func; |
| 37 | 39 | return(true); |
| 38 | 40 | } |
| 39 | -Particles Filter::get_next_state(Particles &p) | |
| 41 | +Filter & Filter::get_next_state(Particles &p) | |
| 40 | 42 | { |
| 41 | 43 | cout<<"go..."<<endl; |
| 42 | 44 | (*state_func)(p); |
| 43 | 45 | cout<<"ok..."<<endl; |
| 46 | + return(*this); | |
| 44 | 47 | } |
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | bool createInitialParticles(); |
| 21 | 21 | int dump_predict_particles(); |
| 22 | 22 | bool set_state_func(Particles (*func)(Particles &p)); |
| 23 | - Particles get_next_state(Particles &p); | |
| 23 | + Filter & get_next_state(Particles &p); | |
| 24 | 24 | }; |
| 25 | 25 | |
| 26 | 26 | #endif |
| @@ -5,7 +5,7 @@ | ||
| 5 | 5 | HEADS=$(SRCS:.cc=.h) |
| 6 | 6 | TARGETS=libparticle.so |
| 7 | 7 | AR=ar |
| 8 | -CFLAGS=-I. -g | |
| 8 | +CFLAGS=-I. -g -Wall | |
| 9 | 9 | all: $(TARGETS) |
| 10 | 10 | |
| 11 | 11 | libparticle.so: $(OBJS) |
Fork