[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[freehaven-cvs] updated scripts to generate graphs
Update of /home/freehaven/cvsroot/doc/e2e-traffic
In directory moria.mit.edu:/tmp/cvs-serv13467
Modified Files:
Makefile
Log Message:
updated scripts to generate graphs
Index: Makefile
===================================================================
RCS file: /home/freehaven/cvsroot/doc/e2e-traffic/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 23 Jan 2004 02:00:27 -0000 1.5
+++ Makefile 24 Jan 2004 14:42:08 -0000 1.6
@@ -21,7 +21,7 @@
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 tmp/*
+ rm -f tmp/fig*
words:
wc -w e2e-traffic.tex
@@ -35,20 +35,18 @@
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*/trial2r.* > tmp/trial2r.analyzed
+ $(ANALYZE) raw*/trial[34]r* > results/trial34r.analyzed
$(ANALYZE) raw*/trial5a* > results/trial5a.analyzed
- $(ANALYZE) raw*/trial5b* > results/trial5b.analyzed
- $(ANALYZE) raw/trial6.* > results/trial6.analyzed
+ $(ANALYZE) raw*/trial6.* > results/trial6.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
+#results/trial2c.analyzed: tmp/trial2.analyzed tmp/trial2u.analyzed
+# $(COMBINE) tmp/trial2.analyzed tmp/trial2u.analyzed > results/trial2c.analyzed
backup:
mkisofs -r -J -o /tmp/backup.iso .
@@ -59,10 +57,10 @@
graph: psgraphs pdfgraphs
-psgraphs: graphs/fig1.eps graphs/fig2a.eps graphs/fig2b.eps graphs/fig34.eps \
+psgraphs: graphs/fig1.eps graphs/fig2a.eps graphs/fig34.eps \
graphs/fig5a.eps graphs/fig6.eps
-pdfgraphs: graphs/fig1.pdf graphs/fig2a.pdf graphs/fig2b.pdf graphs/fig34.pdf \
+pdfgraphs: graphs/fig1.pdf graphs/fig2a.pdf graphs/fig34.pdf \
graphs/fig5a.pdf graphs/fig6.pdf
%.pdf: %.eps
@@ -72,7 +70,8 @@
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; \
+ m=8,16,32,64 \
+ N p50_all m > tmp/fig1-$$B.dat; \
done
fig1: tmp/fig1-5.dat scripts/fig1.gp
@@ -82,16 +81,17 @@
OUT=fig1 gnuplot scripts/pspre.gp scripts/fig1.gp
#========== CASE 2
-tmp/fig2-UU-60.dat: results/trial2c.analyzed Makefile tmp
+tmp/fig2-UU-60.dat: results/trial2r.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; \
+ for S in BU BB; do \
+ CLIP=1 MINSIZE=3 $(POSTPROC) results/trial2r.analyzed \
+ m=8,16 b=125 \
+ S=$$S $$CLIP\
+ N p50_all m b > tmp/fig2-$$S.dat; \
done
+ CLIP=1 MINSIZE=3 $(POSTPROC) results/trial1c.analyzed \
+ N#1048576 \
+ m=8,16 b=125 N p50_all m > tmp/fig2-SD.dat
fig2both: tmp/fig2-UU-60.dat
gnuplot scripts/fig2.gp scripts/viewpost.gp
@@ -109,31 +109,32 @@
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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all 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
+ pA p50_all l bg pA pD > tmp/fig34x8.dat
fig34: tmp/fig34x10.dat scripts/fig34.gp
gnuplot scripts/fig34.gp scripts/viewpost.gp
@@ -148,7 +149,7 @@
for D in 10 60; do \
MINSIZE=3 $(POSTPROC) results/trial5a.analyzed \
l=$$L pD=$$D \
- pJ p90_but1 > tmp/fig5a-$$L-$$D.dat; \
+ pJ p50_all > tmp/fig5a-$$L-$$D.dat; \
done; \
done
@@ -179,9 +180,9 @@
tmp/fig6-10.dat: results/trial6.analyzed Makefile tmp
MINSIZE=3 $(POSTPROC) results/trial6.analyzed \
- pD=10 pOb p90_but1 > tmp/fig6-10.dat
+ pD=10 pOb p50_all > tmp/fig6-10.dat
MINSIZE=3 $(POSTPROC) results/trial6.analyzed \
- pD=60 pOb p90_but1 > tmp/fig6-60.dat
+ pD=60 pOb p50_all > tmp/fig6-60.dat
fig6: tmp/fig6-10.dat scripts/fig6.gp
gnuplot scripts/fig6.gp scripts/viewpost.gp
***********************************************************************
To unsubscribe, send an e-mail to majordomo@seul.org with
unsubscribe freehaven-cvs in the body. http://freehaven.net/