[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] Graphs for all cases except 5a and 5b. More scraps ...
Update of /home/freehaven/cvsroot/doc/e2e-traffic
In directory moria.mit.edu:/tmp/cvs-serv27439
Modified Files:
.cvsignore Makefile
Log Message:
Graphs for all cases except 5a and 5b. More scraps data are forthcoming for 5a, 2, and 6.
Index: .cvsignore
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore 30 Jul 2003 18:46:58 -0000 1.1
+++ .cvsignore 23 Jan 2004 00:34:18 -0000 1.2
@@ -5,3 +5,6 @@
*.blg
*.bbl
*.aux
+tmp
+raw
+raw-partial
Index: Makefile
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile 22 Jan 2004 03:52:47 -0000 1.3
+++ Makefile 23 Jan 2004 00:34:18 -0000 1.4
@@ -20,7 +20,8 @@
clean:
rm -f e2e-traffic.ps e2e-traffic.ps e2e-traffic.aux e2e-traffic.log
rm -f e2e-traffic.bbl e2e-traffic.blg e2e-traffic.dvi
- rm -f *~
+ rm -f *~ */*~
+ rm -f tmp/*
words:
wc -w e2e-traffic.tex
@@ -28,27 +29,131 @@
#----------------------------------------------------------------------
PYTHON=python2.3
ANALYZE=$(PYTHON) src/analyze.py
-analysis:
- $(ANALYZE) raw/trial1.* > results/trial1.analyzed
- $(ANALYZE) raw/trial1u.* > results/trial1u.analyzed
- $(ANALYZE) raw/trial2.* > results/trial2.analyzed
- $(ANALYZE) raw*/trial2u.* > results/trial2u.analyzed
- $(ANALYZE) raw/trial3.* > results/trial3.analyzed
- $(ANALYZE) raw/trial3r* > results/trial3r.analyzed
- $(ANALYZE) raw/trial3* > results/trial3all.analyzed
- $(ANALYZE) raw/trial4.* > results/trial4.analyzed
- $(ANALYZE) raw/trial4r* > results/trial4r.analyzed
- $(ANALYZE) raw/trial4* > results/trial4all.analyzed
+COMBINE=$(PYTHON) src/combine.py
+POSTPROC=$(PYTHON) src/postproc.py
+
+analysis: results
+ $(ANALYZE) raw/trial1.* > tmp/trial1.analyzed
+ $(ANALYZE) raw/trial1u.* > tmp/trial1u.analyzed
+ $(ANALYZE) raw/trial2.* > tmp/trial2.analyzed
+ $(ANALYZE) raw*/trial2u.* > tmp/trial2u.analyzed
$(ANALYZE) raw/trial[34]r* > results/trial34r.analyzed
- $(ANALYZE) raw/trial[34]* > results/trial34all.analyzed
$(ANALYZE) raw*/trial5a* > results/trial5a.analyzed
$(ANALYZE) raw*/trial5b* > results/trial5b.analyzed
$(ANALYZE) raw/trial6.* > results/trial6.analyzed
-combine:
- ./src/combine.py results/trial1.analyzed results/trial1u.analyzed > results/trial1c.analyzed
- ./src/combine.py results/trial2.analyzed results/trial2u.analyzed > results/trial2c.analyzed
+combine: results/trial1c.analyzed results/trial2c.analyzed
+
+results/trial1c.analyzed: tmp/trial1.analyzed tmp/trial1u.analyzed
+ $(COMBINE) tmp/trial1.analyzed tmp/trial1u.analyzed > results/trial1c.analyzed
+
+results/trial2c.analyzed: tmp/trial2.analyzed tmp/trial2u.analyzed
+ $(COMBINE) tmp/trial2.analyzed tmp/trial2u.analyzed > results/trial2c.analyzed
backup:
mkisofs -r -J backup.iso raw raw-partial results
+#----------------------------------------------------------------------
+tmp:
+ mkdir tmp
+
+graph: psgraphs pdfgraphs
+
+psgraphs: graphs/fig1.eps graphs/fig2a.eps graphs/fig2b.eps graphs/fig34.eps \
+ graphs/fig6.eps
+
+pdfgraphs: graphs/fig1.pdf graphs/fig2a.pdf graphs/fig2b.pdf graphs/fig34.pdf \
+ graphs/fig6.pdf
+
+%.pdf: %.eps
+ epstopdf $<
+
+#========== CASE 1
+tmp/fig1-5.dat: results/trial1c.analyzed Makefile tmp
+ for B in 5 25 125 1000; do \
+ CLIP=1 MINSIZE=2 $(POSTPROC) results/trial1c.analyzed b=$$B \
+ N p90_but1 m > tmp/fig1-$$B.dat; \
+ done
+
+fig1: tmp/fig1-5.dat scripts/fig1.gp
+ gnuplot scripts/fig1.gp scripts/viewpost.gp
+
+graphs/fig1.eps: tmp/fig1-5.dat scripts/fig1.gp scripts/pspre.gp
+ OUT=fig1 gnuplot scripts/pspre.gp scripts/fig1.gp
+
+#========== CASE 2
+tmp/fig2-UU-60.dat: results/trial2c.analyzed Makefile tmp
+ CLIP=""; \
+ for pM in 60 90; do \
+ for S in UU BU BB; do \
+ CLIP=1 MINSIZE=3 $(POSTPROC) results/trial2c.analyzed \
+ p50_but1#100 \
+ pM=$$pM S=$$S $$CLIP\
+ N p50_but1 m b > tmp/fig2-$$S-$$pM.dat; \
+ done; \
+ done
+
+fig2both: tmp/fig2-UU-60.dat
+ gnuplot scripts/fig2.gp scripts/viewpost.gp
+
+fig2a: tmp/fig2-UU-60.dat scripts/fig2a.gp
+ gnuplot scripts/fig2a.gp scripts/viewpost.gp
+
+fig2b: tmp/fig2-UU-60.dat scripts/fig2b.gp
+ gnuplot scripts/fig2b.gp scripts/viewpost.gp
+
+graphs/fig2a.eps: tmp/fig2-UU-60.dat scripts/fig2a.gp
+ OUT=fig2a gnuplot scripts/pspre.gp scripts/fig2a.gp
+
+graphs/fig2b.eps: tmp/fig2-UU-60.dat scripts/fig2b.gp
+ OUT=fig2b gnuplot scripts/pspre.gp scripts/fig2b.gp
+
+#========== CASES 3,4
+tmp/fig34x10.dat: results/trial34r.analyzed Makefile tmp
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 pD=10 \
+ pA p90_but1 l bg pA > tmp/fig34x10.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 pD=30 \
+ pA p90_but1 l bg pA > tmp/fig34x30.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 pD=60 \
+ pA p90_but1 l bg pA > tmp/fig34x60.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 pD=90 \
+ pA p90_but1 l bg pA > tmp/fig34x90.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 l=1 \
+ pA p90_but1 l bg pA pD > tmp/fig34x1.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 l=2 \
+ pA p90_but1 l bg pA pD> tmp/fig34x2.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 l=4 \
+ pA p90_but1 l bg pA pD > tmp/fig34x4.dat
+ MINSIZE=3 $(POSTPROC) results/trial34r.analyzed \
+ bg=125 l=8 \
+ pA p90_but1 l bg pA pD > tmp/fig34x8.dat
+
+fig34: tmp/fig34x10.dat scripts/fig34.gp
+ gnuplot scripts/fig34.gp scripts/viewpost.gp
+
+graphs/fig34.eps: tmp/fig34x10.dat scripts/fig34.gp
+ OUT=fig34 gnuplot scripts/pspre.gp scripts/fig34.gp
+
+#========== CASE 5
+
+
+#========== CASE 6
+
+tmp/fig6-10.dat: results/trial6.analyzed Makefile tmp
+ MINSIZE=3 $(POSTPROC) results/trial6.analyzed \
+ pD=10 pOb p90_but1 > tmp/fig6-10.dat
+ MINSIZE=3 $(POSTPROC) results/trial6.analyzed \
+ pD=60 pOb p90_but1 > tmp/fig6-60.dat
+
+fig6: tmp/fig6-10.dat scripts/fig6.gp
+ gnuplot scripts/fig6.gp scripts/viewpost.gp
+
+graphs/fig6.eps: tmp/fig6-10.dat scripts/fig6.gp
+ OUT=fig6 gnuplot scripts/pspre.gp scripts/fig6.gp
\ No newline at end of file
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/