diff --git a/2008-displacement/Makefile b/2008-displacement/Makefile index db583ef..a046819 100644 --- a/2008-displacement/Makefile +++ b/2008-displacement/Makefile @@ -1,4 +1,4 @@ -all: main xy2d paper.pdf +all: main xy2d xy2d: xy2d.c $(CC) -W -Wall $^ -o $@ @@ -6,12 +6,6 @@ xy2d: xy2d.c main: main.c $(CC) -Wall -O3 -funroll-loops -ffast-math -W -Wall $^ -o $@ $$(pkg-config --cflags --libs sdl) -lSDL_image -lm -paper.pdf: paper.tex fs-histo.tex - latex paper.tex - latex paper.tex - dvipdf paper.dvi - clean: - rm -f paper.log paper.dvi paper.aux paper.pdf rm -f xy2d main diff --git a/2008-displacement/main.c b/2008-displacement/main.c index 53c4966..9a0c5be 100644 --- a/2008-displacement/main.c +++ b/2008-displacement/main.c @@ -105,6 +105,7 @@ static float *fullgauss(float const *src, float mat[NN][NN]) return dest; } +#if 0 static float fulldist(float const *p1, const float *p2) { float error = 0.; @@ -119,6 +120,7 @@ static float fulldist(float const *p1, const float *p2) return error / (WIDTH * HEIGHT); } +#endif static float dist(float const *p1, float const *p2, float max) { diff --git a/2008-displacement/paper/Makefile b/2008-displacement/paper/Makefile new file mode 100644 index 0000000..882909a --- /dev/null +++ b/2008-displacement/paper/Makefile @@ -0,0 +1,10 @@ +all: paper.pdf + +paper.pdf: paper.tex fs-histo.tex + latex paper.tex + latex paper.tex + dvipdf paper.dvi + +clean: + rm -f paper.log paper.dvi paper.aux paper.pdf + diff --git a/2008-displacement/direction.tex b/2008-displacement/paper/direction.tex similarity index 100% rename from 2008-displacement/direction.tex rename to 2008-displacement/paper/direction.tex diff --git a/2008-displacement/fs-histo.eps b/2008-displacement/paper/fs-histo.eps similarity index 100% rename from 2008-displacement/fs-histo.eps rename to 2008-displacement/paper/fs-histo.eps diff --git a/2008-displacement/fs-histo.tex b/2008-displacement/paper/fs-histo.tex similarity index 100% rename from 2008-displacement/fs-histo.tex rename to 2008-displacement/paper/fs-histo.tex diff --git a/2008-displacement/jajuni-histo.eps b/2008-displacement/paper/jajuni-histo.eps similarity index 100% rename from 2008-displacement/jajuni-histo.eps rename to 2008-displacement/paper/jajuni-histo.eps diff --git a/2008-displacement/jajuni-histo.tex b/2008-displacement/paper/jajuni-histo.tex similarity index 100% rename from 2008-displacement/jajuni-histo.tex rename to 2008-displacement/paper/jajuni-histo.tex diff --git a/2008-displacement/lena-min.eps b/2008-displacement/paper/lena-min.eps similarity index 100% rename from 2008-displacement/lena-min.eps rename to 2008-displacement/paper/lena-min.eps diff --git a/2008-displacement/lena-min.tex b/2008-displacement/paper/lena-min.tex similarity index 100% rename from 2008-displacement/lena-min.tex rename to 2008-displacement/paper/lena-min.tex diff --git a/2008-displacement/lena.eps b/2008-displacement/paper/lena.eps similarity index 100% rename from 2008-displacement/lena.eps rename to 2008-displacement/paper/lena.eps diff --git a/2008-displacement/llncs.cls b/2008-displacement/paper/llncs.cls similarity index 100% rename from 2008-displacement/llncs.cls rename to 2008-displacement/paper/llncs.cls diff --git a/2008-displacement/optimum-histo.eps b/2008-displacement/paper/optimum-histo.eps similarity index 100% rename from 2008-displacement/optimum-histo.eps rename to 2008-displacement/paper/optimum-histo.eps diff --git a/2008-displacement/optimum-histo.tex b/2008-displacement/paper/optimum-histo.tex similarity index 100% rename from 2008-displacement/optimum-histo.tex rename to 2008-displacement/paper/optimum-histo.tex diff --git a/2008-displacement/ostro-histo.eps b/2008-displacement/paper/ostro-histo.eps similarity index 100% rename from 2008-displacement/ostro-histo.eps rename to 2008-displacement/paper/ostro-histo.eps diff --git a/2008-displacement/ostro-histo.tex b/2008-displacement/paper/ostro-histo.tex similarity index 100% rename from 2008-displacement/ostro-histo.tex rename to 2008-displacement/paper/ostro-histo.tex diff --git a/2008-displacement/paper.tex b/2008-displacement/paper/paper.tex similarity index 100% rename from 2008-displacement/paper.tex rename to 2008-displacement/paper/paper.tex diff --git a/2008-displacement/serpopt-histo.eps b/2008-displacement/paper/serpopt-histo.eps similarity index 100% rename from 2008-displacement/serpopt-histo.eps rename to 2008-displacement/paper/serpopt-histo.eps diff --git a/2008-displacement/serpopt-histo.tex b/2008-displacement/paper/serpopt-histo.tex similarity index 100% rename from 2008-displacement/serpopt-histo.tex rename to 2008-displacement/paper/serpopt-histo.tex