Changeset 12332

Timestamp:

07/05/2009 04:57:58 PM (14 months ago)

Author:

dstn

Message:

new mindist figs

Location:

trunk/documents/theses/dstn

Files:

• Makefile (modified) (2 diffs)
• figs-kdtree/kdtree-mindist.tex (added)
• figs-kdtree/mindist-bbox.pdf (added)
• figs-kdtree/mindist-split.pdf (added)
• kdtree.tex (modified) (2 diffs)
• mindist-split.pdf (deleted)
• preamble.tex (modified) (1 diff)
• thesis/plotstyle.py (modified) (4 diffs)

trunk/documents/theses/dstn/Makefile

@@ -34 +34 @@
 
 kdfigs.tex: $(addsuffix .tex,$(addprefix figs-kdtree/, \
-                kdtree-eg kdfigs-tikz))
+                kdtree-eg kdtree-mindist kdfigs-tikz))
         cat $^ > $@
 
@@ -43 +43 @@
         pdflatex $<
 
-KDFIGS := kdtree-bbox kdtree-split
+KDFIGS := kdtree-bbox kdtree-split mindist-bbox mindist-split
 
 KD_FIGS := $(addsuffix .pdf,$(addprefix figs-kdtree/,$(KDFIGS)))

trunk/documents/theses/dstn/kdtree.tex

@@ -299 +299 @@
   \> p\_right = [p in points
               where p[dim] > \spc split\_val] \\
-  \> return (points\_left, points\_right, split\_val)
+  \> return (p\_left, p\_right, split\_val)
 \end{pcode}
 \caption{Pseudocode for \kdtree construction.}
@@ -326 +326 @@
 \begin{figure}
 \begin{center}%
-\begin{tabular}{@{}c@{}c@{}}
-\includegraphics[width=0.49\columnwidth]{mindist-bb}&
-\includegraphics[width=0.49\columnwidth]{mindist-split}%
+\begin{tabular}{@{}c@{\hspace{3em}}c@{}}
+\mindistbboxfig &
+\mindistsplitfig
 \end{tabular}
 \end{center}
 \caption{\captionpart{Left:} \mindist for a \kdtree node with bounding boxes.
-\captionpart{Right:} \mindist for a \kdtree node with only the splitting dimension and value,
-the \mindist is zero for the child on the same side of the splitting
-plane as the query point; for the other child the \mindist is simply
-the distance in the splitting dimension from the query to the
-splitting plane.}
+The query point is shown as a gray dot, and the \mindist s to the two
+boundig-boxes are shown by the arrows.
+\captionpart{Right:} \mindist for a \kdtree node with only the splitting
+dimension and value.  The \mindist is zero for the child on the same
+side of the splitting plane as the query point; for the other child
+the \mindist is simply the distance in the splitting dimension from
+the query to the splitting plane.}
 \label{fig:mindist}
 \end{figure}

trunk/documents/theses/dstn/preamble.tex

@@ -149 +149 @@
 \newenvironment{pcode}
                {\begin{center}% \fbox{%
+                             \linespacing{1.25}
                \begin{minipage}[c]{\textwidth}%
                \begin{codesize}%

trunk/documents/theses/dstn/thesis/plotstyle.py

@@ -72 +72 @@
                 bottom = 0.12
         if (fig in ['aegis-acs-quad', 'sdss-quad', 'galex-quad'] or
-                fig.startswith('kdtree-')):
+                fig.startswith('kdtree-') or fig.startswith('mindist-')):
                 # full-screen
                 left = 0.005
@@ -78 +78 @@
                 top = 0.005
                 bottom = 0.005
+        if fig.startswith('mindist-'):
+                # a bit narrower...
+                figw = 0.9
         if fig == 'sdss-quad':
                 figh = 8.98 / 13.10
@@ -83 +86 @@
         if fig in ['kdtree-bbox', 'kdtree-split']:
                 figh = 4.4
-
 
         figure(figsize=(scale*figw,scale*figh), dpi=300)
@@ -140 +142 @@
                                 'kdtree-bbox': 'kdtreebboxfig',
                                 'kdtree-split': 'kdtreesplitfig',
+                                'mindist-bbox': 'mindistbboxfig',
+                                'mindist-split': 'mindistsplitfig',
                                 }
         if fig in namemap: