Permalink
Browse files

remove demo.sh scripts, move demos to Makefiles

  • Loading branch information...
1 parent f47afc5 commit 8b8afc404ea3535d9f51bad6817e604b0020e4f9 @albertoruiz committed Apr 29, 2012
View
@@ -0,0 +1,7 @@
+projects = tour demos vision/geom vision/multiview patrec gpu
+
+all:
+ cd packages; make
+ cd packages; make optional
+ cd projects; make
+
View
@@ -120,7 +120,7 @@ installation instructions
$ cd ../projects/demos
$ make
- $ ./demo.sh
+ $ make demo
9. Read the tutorial.
View
@@ -1,19 +1,5 @@
-SRC = $(wildcard *.hs)
-EXEC = $(SRC:.hs=)
+projects = tour demos vision/geom vision/multiview patrec gpu
-all: $(EXEC)
-
-ghci:
- ghc -e '(writeFile "session" . unlines . map (":l "++) . words) "$(SRC)"'
- ghci < session
- rm session
-
-%: %.hs
- ghc --make -O2 -threaded $*
- rm $*.o $*.hi
-
-clean:
- rm -rf $(wildcard *.o)
- rm -rf $(wildcard *.hi)
- rm -rf $(EXEC)
+all:
+ for p in $(projects); do cd $$p; make clean; make; cd -; done
View
@@ -0,0 +1,14 @@
+SRC = $(wildcard *.hs)
+EXEC = $(SRC:.hs=)
+
+all: $(EXEC)
+
+%: %.hs
+ ghc --make -O2 -threaded $*
+ rm $*.o $*.hi
+
+clean:
+ rm -rf $(wildcard *.o)
+ rm -rf $(wildcard *.hi)
+ rm -rf $(EXEC)
+
View
View
@@ -0,0 +1,16 @@
+include ../Makefile.include
+
+demo:
+ ./mirror
+ ./hessharr
+ ./warp
+ ./points
+ ./imagproc
+ ./gradient
+ ./trail
+ ./pose ../../data/videos/rot4.avi
+ ./spline
+ ./transi ../../data/images/transi
+ # ./imagproc --photosmp=../../data/images/transi
+ ./imagproc --photos=../../data/images/transi
+
View
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-./mirror
-./hessharr
-./warp
-./points
-./imagproc
-./gradient
-./trail
-./pose ../../data/videos/rot4.avi
-./spline
-./transi ../../data/images/transi
-# ./imagproc --photosmp=../../data/images/transi
-./imagproc --photos=../../data/images/transi
-
View
@@ -1,6 +1,6 @@
-- $ mplayer saved.y4m -demuxer y4m
-- (or -vc rawi420)
--- $ mencoder saved.y4m -vc rawi420 -fps 20 -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell:v4mv:turbo -o saved.avi
+-- $ mencoder -o saved.avi saved.y4m -vc rawi420 -fps 30 -ovc lavc -lavcopts vcodec=mpeg4:mbd=2:trell:v4mv:turbo:vbitrate=2000
{-# LANGUAGE Arrows #-}
View
View
@@ -0,0 +1,8 @@
+include ../Makefile.include
+
+demo:
+ ./siftgpu
+ ./track
+ ./match
+ ./classify
+
View
View
@@ -0,0 +1,14 @@
+include ../Makefile.include
+
+demo:
+ ./democlass
+ ./demotest
+ ./scatters
+ ./em
+ ./ferns
+ ./pls
+ ./probability
+ ./bayesgauss
+ ./cs
+ ./ukf
+
@@ -40,7 +40,7 @@ scatter examples (i,j) colornames prefun = clearColor white . prep $ [ prefun, p
b2 = maximum ys
da = 0.05*(a2-a1)
db = 0.05*(b2-b1)
- prep = withOrtho2D (a1-da) (a2+da) (b1-db) (b2+db)
+ prep = withOrtho2D (doubleGL $ a1-da) (doubleGL $ a2+da) (doubleGL $ b1-db) (doubleGL $ b2+db)
colors = take (length gs) (colornames ++ [red,blue,green,yellow,orange]++ repeat white)
@@ -69,7 +69,7 @@ scatter3D examples (i,j,k) colornames prefun = clearColor white $ [ prefun, poin
plot = Raw . GL.renderPrimitive GL.Points . mapM_ (\v-> vertex (Vertex3 (doubleGL $ v@>i) (doubleGL $ v@>j) (doubleGL $ v@>k))) -- FIXME using Point3D
colors = take (length gs) (colornames++defaultColors)
-
+ {-
axes = Raw $
GL.renderPrimitive GL.Lines $ mapM_ vertex [ -- FIXME using Point3D
Vertex3 0 0 0,
@@ -78,7 +78,9 @@ scatter3D examples (i,j,k) colornames prefun = clearColor white $ [ prefun, poin
Vertex3 0 1 0,
Vertex3 0 0 0,
Vertex3 0 0 (1::Float)]
-
+ -}
+ axes = axes3D 1
+
defaultColors = [red, blue, green, orange, brown ] ++ repeat gray
View
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-./democlass
-./demotest
-./scatters
-./em
-./ferns
-./pls
-./probability
-./bayesgauss
-./cs
-./ukf
-
View
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-./play
-./play1
-./play1 '../../data/videos/rot4.avi -benchmark'
-./grid
-./play3 '../../data/videos/rot4.avi -fps 30' --live
-./play3 '../../data/videos/rot4.avi -fps 30' --chan
-./play3
-./arrows
-./choice
-./loop
-./nocircuit ../../data/videos/rcube.avi
-./circuit ../../data/videos/rcube.avi
-./smon
-./play4
-./play5
-./interface
-./param
-./stand1
-./stand2
-./stand3
-./nogui '../../data/videos/rot4.avi -benchmark'
-./batch '../../data/videos/rot4.avi -benchmark'
-./single ../../data/images/transi/dscn2070.jpg \
- ../../data/images/transi/dscn2070.jpg
-
-./play6
-./play0
-
@@ -0,0 +1,9 @@
+include ../../Makefile.include
+
+demo:
+ ./horizon --points=pts2d.txt --image=../../../data/images/calibration/disk1.jpg
+ ./rectify --points=pts2d.txt --image=../../../data/images/calibration/disk1.jpg
+ ./resection --points=pts3d.txt --image=../../../data/images/calibration/cal1.jpg
+ ./resection2 --points=pcube37.txt --image=../../../data/images/calibration/cube1.png
+ ./stereo --points1=pl.txt --image1=../../../data/images/calibration/cube3.png --points2=pr.txt --image2=../../../data/images/calibration/cube4.png
+
@@ -0,0 +1,6 @@
+include ../../Makefile.include
+
+demo:
+ ./geademo
+ ./geademo --tracks=trafalgar-21
+
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-./geademo
-./geademo --tracks=trafalgar-21
-

0 comments on commit 8b8afc4

Please sign in to comment.