Tranitioned king_vs_best from Gnuplot to Asymptote

diff --git a/tex/src/figures/fit-space/Makefile b/tex/src/figures/fit-space/Makefile
index f3046053cabdca820f2b087d3ab3a995c5ffd54b..894f47e6e140f01ac5aeeb961c558eaf5e2a5cfe 100644 (file)
--- a/tex/src/figures/fit-space/Makefile
+++ b/tex/src/figures/fit-space/Makefile
@@ -1,10 +1,29 @@
-all : fig.pdf
+ASYPROCESS = ../asy/asyprocess \
+  --texinputs=../..: \
+  --pretex='\documentclass{drexel-thesis} \input{packages}' \
+  --
+
+FIGS = fit_valley king_vs_best
+FIT_VALLEY_DATA = data
+KING_VS_BEST_DATA = Best_2002_detailed_unfolding_pathway/fig3a-kx.data fit_valley.data
+DATA = $(FIT_VALLEY_DATA) $(KING_VS_BEST_DATA)
+
+# Never delete intermediates.  (`info make` 10.4 Chains of Implicit Rules)
+.SECONDARY :
+
+
+all : $(FIGS:%=%_.tex)
 
 clean :
-       rm -f fig.pdf fit_valley.data
+       rm -f $(FIGS:%=%_*) $(FIGS:%=%-*) *.pyc \
+               fit_valley.data Best_2002_detailed_unfolding_pathway/fig3a-kx.data
 
-fig.pdf : fit_valley.data
-       gnuplot plot.gp
+%_.tex : %.asy $(DATA)
+       $(ASYPROCESS) $(patsubst %.asy, %, $<)
 
 fit_valley.data : extract_fit_valley.py data
        cat data | python $< > $@
+
+Best_2002_detailed_unfolding_pathway/fig3a-kx.data : Best_2002_detailed_unfolding_pathway/fig3a.data
+       grep -v '^#' $< | awk 'BEGIN{OFS="\t"}{print $$2, $$1}' > $@
+

diff --git a/tex/src/figures/fit-space/king_vs_best.asy b/tex/src/figures/fit-space/king_vs_best.asy
new file mode 100644 (file)
index 0000000..43c4367
--- /dev/null
+++ b/tex/src/figures/fit-space/king_vs_best.asy
@@ -0,0 +1,18 @@
+import wtk_graph;
+
+size(15cm,10cm,IgnoreAspect);
+
+scale(Log, Linear);
+real xscale=1;
+real yscale=1;
+
+graphFile("Best_2002_detailed_unfolding_pathway/fig3a-kx.data", xscale, yscale, psoft, m30,
+         t="Best valley", dots=true);
+graphFile("fit_valley.data", xscale, yscale, phard, m30,
+         t="King valley", dots=true);
+
+label(sLabel(""), point(N), N);
+xaxis(sLabel("$k_{u0}$ ($1/$s)"), BottomTop, LeftTicks);
+yaxis(sLabel("$x_u$ (m)"), LeftRight, RightTicks);
+
+add(legend(), point(E), 20E, UnFill);

diff --git a/tex/src/figures/fit-space/king_vs_best.gp b/tex/src/figures/fit-space/king_vs_best.gp
index b29574e38c8249784452a243504810aa5766b81e..9faad4638d0752029ea2a1537f88b40169c8f768 100644 (file)
--- a/tex/src/figures/fit-space/king_vs_best.gp
+++ b/tex/src/figures/fit-space/king_vs_best.gp
@@ -1,5 +1,5 @@
-set terminal png
-set output 'king_vs_best.png'
+#set terminal png
+#set output 'king_vs_best.png'
 g(x) = 39.727*exp(-40.7215e9*x)                                                          
 f(x) = 25.4465*exp(-44.6235e9*x) 
 set logscale y

diff --git a/tex/src/figures/fit-space/king_vs_best.png b/tex/src/figures/fit-space/king_vs_best.png
deleted file mode 100644 (file)
index 51e4fb5..0000000
Binary files a/tex/src/figures/fit-space/king_vs_best.png and /dev/null differ

diff --git a/tex/src/figures/fit-space/wtk_graph.asy b/tex/src/figures/fit-space/wtk_graph.asy
new file mode 120000 (symlink)
index 0000000..6142fdb
--- /dev/null
+++ b/tex/src/figures/fit-space/wtk_graph.asy
@@ -0,0 +1 @@
+../asy/wtk_graph.asy
\ No newline at end of file