Merge branch 'master' of https://github.com/EducationalTestingService…

…/gridmap

doc/class-tree.html

@@ -84,7 +84,7 @@ <h1 class="epydoc">Class Hierarchy</h1>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap-module.html

@@ -61,7 +61,7 @@ <h1 class="epydoc">Package gridmap</h1><p class="nomargin-top"><span class="code
         </dd>
       </dl>
       <p><strong>Version:</strong>
-        0.9.5
+        0.9.6
       </p>
 </div><!-- ==================== SUBMODULES ==================== -->
 <a name="section-Submodules"></a>
@@ -141,7 +141,7 @@ <h1 class="epydoc">Package gridmap</h1><p class="nomargin-top"><span class="code
         <span class="summary-sig-arg">num_slots</span>=<span class="summary-sig-default">1</span>,
         <span class="summary-sig-arg">temp_dir</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">white_list</span>=<span class="summary-sig-default">None</span>,
-        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">quiet</span>=<span class="summary-sig-default">True</span>)</span><br />
       Maps a function onto the cluster.</td>
           <td align="right" valign="top">
@@ -167,7 +167,7 @@ <h1 class="epydoc">Package gridmap</h1><p class="nomargin-top"><span class="code
         <span class="summary-sig-arg">num_slots</span>=<span class="summary-sig-default">1</span>,
         <span class="summary-sig-arg">temp_dir</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">white_list</span>=<span class="summary-sig-default">None</span>,
-        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">quiet</span>=<span class="summary-sig-default">True</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="gridmap.job-pysrc.html#pg_map">source&nbsp;code</a></span>
@@ -201,7 +201,7 @@ <h1 class="epydoc">Package gridmap</h1><p class="nomargin-top"><span class="code
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DEFAULT_QUEUE"></a><span class="summary-name">DEFAULT_QUEUE</span> = <code title="'nlp.q'"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></code><br />
+        <a name="DEFAULT_QUEUE"></a><span class="summary-name">DEFAULT_QUEUE</span> = <code title="u'all.q'"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></code><br />
       The default job scheduling queue to use; can be overriden via the 
       GRID_MAP_DEFAULT_QUEUE environment variable.
     </td>
@@ -303,7 +303,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">grid_map</span>(<spa
         <span class="sig-arg">num_slots</span>=<span class="sig-default">1</span>,
         <span class="sig-arg">temp_dir</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">white_list</span>=<span class="sig-default">None</span>,
-        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">quiet</span>=<span class="sig-default">True</span>)</span>
   </h3>
   </td><td align="right" valign="top"
@@ -354,7 +354,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">pg_map</span>(<span
         <span class="sig-arg">num_slots</span>=<span class="sig-default">1</span>,
         <span class="sig-arg">temp_dir</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">white_list</span>=<span class="sig-default">None</span>,
-        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">quiet</span>=<span class="sig-default">True</span>)</span>
   </h3>
   </td><td align="right" valign="top"
@@ -416,7 +416,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">pg_map</span>(<span
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap-pysrc.html

@@ -110,7 +110,7 @@ <h1 class="epydoc">Source Code for <a href="gridmap-module.html">Package gridmap
 <a name="L53"></a><tt class="py-lineno">53</tt>  <tt class="py-line"> </tt>
 <a name="L54"></a><tt class="py-lineno">54</tt>  <tt class="py-line"> </tt>
 <a name="L55"></a><tt class="py-lineno">55</tt>  <tt class="py-line"><tt class="py-comment"># Version info</tt> </tt>
-<a name="L56"></a><tt class="py-lineno">56</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-string">'0.9.5'</tt> </tt>
+<a name="L56"></a><tt class="py-lineno">56</tt>  <tt class="py-line"><tt class="py-name">__version__</tt> <tt class="py-op">=</tt> <tt class="py-string">'0.9.6'</tt> </tt>
 <a name="L57"></a><tt class="py-lineno">57</tt>  <tt class="py-line"><tt id="link-14" class="py-name" targets="Variable gridmap.VERSION=gridmap-module.html#VERSION"><a title="gridmap.VERSION" class="py-name" href="#" onclick="return doclink('link-14', 'VERSION', 'link-14');">VERSION</a></tt> <tt class="py-op">=</tt> <tt class="py-name">tuple</tt><tt class="py-op">(</tt><tt class="py-name">int</tt><tt class="py-op">(</tt><tt class="py-name">x</tt><tt class="py-op">)</tt> <tt class="py-keyword">for</tt> <tt class="py-name">x</tt> <tt class="py-keyword">in</tt> <tt class="py-name">__version__</tt><tt class="py-op">.</tt><tt class="py-name">split</tt><tt class="py-op">(</tt><tt class="py-string">'.'</tt><tt class="py-op">)</tt><tt class="py-op">)</tt> </tt>
 <a name="L58"></a><tt class="py-lineno">58</tt>  <tt class="py-line"> </tt>
 <a name="L59"></a><tt class="py-lineno">59</tt>  <tt class="py-line"><tt class="py-comment"># For * imports</tt> </tt>
@@ -149,7 +149,7 @@ <h1 class="epydoc">Source Code for <a href="gridmap-module.html">Package gridmap
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap.data-module.html

@@ -277,7 +277,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">zload_db</span>(<spa
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap.data-pysrc.html

@@ -194,7 +194,7 @@ <h1 class="epydoc">Source Code for <a href="gridmap.data-module.html" onclick="s
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap.job-module.html

@@ -121,7 +121,7 @@ <h1 class="epydoc">Module job</h1><p class="nomargin-top"><span class="codelink"
         <span class="summary-sig-arg">num_slots</span>=<span class="summary-sig-default">1</span>,
         <span class="summary-sig-arg">temp_dir</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">white_list</span>=<span class="summary-sig-default">None</span>,
-        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">quiet</span>=<span class="summary-sig-default">True</span>)</span><br />
       Maps a function onto the cluster.</td>
           <td align="right" valign="top">
@@ -147,7 +147,7 @@ <h1 class="epydoc">Module job</h1><p class="nomargin-top"><span class="codelink"
         <span class="summary-sig-arg">num_slots</span>=<span class="summary-sig-default">1</span>,
         <span class="summary-sig-arg">temp_dir</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">white_list</span>=<span class="summary-sig-default">None</span>,
-        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">quiet</span>=<span class="summary-sig-default">True</span>)</span></td>
           <td align="right" valign="top">
             <span class="codelink"><a href="gridmap.job-pysrc.html#pg_map">source&nbsp;code</a></span>
@@ -199,7 +199,7 @@ <h1 class="epydoc">Module job</h1><p class="nomargin-top"><span class="codelink"
     <td width="15%" align="right" valign="top" class="summary">
       <span class="summary-type">&nbsp;</span>
     </td><td class="summary">
-        <a name="DEFAULT_QUEUE"></a><span class="summary-name">DEFAULT_QUEUE</span> = <code title="'nlp.q'"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></code><br />
+        <a name="DEFAULT_QUEUE"></a><span class="summary-name">DEFAULT_QUEUE</span> = <code title="u'all.q'"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></code><br />
       The default job scheduling queue to use; can be overriden via the 
       GRID_MAP_DEFAULT_QUEUE environment variable.
     </td>
@@ -269,7 +269,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">grid_map</span>(<spa
         <span class="sig-arg">num_slots</span>=<span class="sig-default">1</span>,
         <span class="sig-arg">temp_dir</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">white_list</span>=<span class="sig-default">None</span>,
-        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">quiet</span>=<span class="sig-default">True</span>)</span>
   </h3>
   </td><td align="right" valign="top"
@@ -320,7 +320,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">pg_map</span>(<span
         <span class="sig-arg">num_slots</span>=<span class="sig-default">1</span>,
         <span class="sig-arg">temp_dir</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">/scratch/</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">white_list</span>=<span class="sig-default">None</span>,
-        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>,
+        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">quiet</span>=<span class="sig-default">True</span>)</span>
   </h3>
   </td><td align="right" valign="top"
@@ -382,7 +382,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">pg_map</span>(<span
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap.job-pysrc.html

@@ -246,7 +246,7 @@ <h1 class="epydoc">Source Code for <a href="gridmap.job-module.html" onclick="sh
 <a name="L189"></a><tt class="py-lineno">189</tt>  <tt class="py-line"><tt class="py-docstring">        define python-style getter</tt> </tt>
 <a name="L190"></a><tt class="py-lineno">190</tt>  <tt class="py-line"><tt class="py-docstring">        """</tt> </tt>
 <a name="L191"></a><tt class="py-lineno">191</tt>  <tt class="py-line"> </tt>
-<a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line">        <tt id="link-49" class="py-name"><a title="gridmap.job.Job.ret" class="py-name" href="#" onclick="return doclink('link-49', 'ret', 'link-20');">ret</a></tt> <tt class="py-op">=</tt> <tt class="py-string">""</tt> </tt>
+<a name="L192"></a><tt class="py-lineno">192</tt>  <tt class="py-line">        <tt id="link-49" class="py-name"><a title="gridmap.job.Job.ret" class="py-name" href="#" onclick="return doclink('link-49', 'ret', 'link-20');">ret</a></tt> <tt class="py-op">=</tt> <tt class="py-string">"-shell yes -b yes"</tt> </tt>
 <a name="L193"></a><tt class="py-lineno">193</tt>  <tt class="py-line"> </tt>
 <a name="L194"></a><tt class="py-lineno">194</tt>  <tt class="py-line">        <tt class="py-keyword">if</tt> <tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-50" class="py-name"><a title="gridmap.job.Job.name" class="py-name" href="#" onclick="return doclink('link-50', 'name', 'link-29');">name</a></tt><tt class="py-op">:</tt> </tt>
 <a name="L195"></a><tt class="py-lineno">195</tt>  <tt class="py-line">            <tt id="link-51" class="py-name"><a title="gridmap.job.Job.ret" class="py-name" href="#" onclick="return doclink('link-51', 'ret', 'link-20');">ret</a></tt> <tt class="py-op">+=</tt> <tt class="py-string">" -N {0}"</tt><tt class="py-op">.</tt><tt class="py-name">format</tt><tt class="py-op">(</tt><tt class="py-name">self</tt><tt class="py-op">.</tt><tt id="link-52" class="py-name"><a title="gridmap.job.Job.name" class="py-name" href="#" onclick="return doclink('link-52', 'name', 'link-29');">name</a></tt><tt class="py-op">)</tt> </tt>
@@ -654,7 +654,7 @@ <h1 class="epydoc">Source Code for <a href="gridmap.job-module.html" onclick="sh
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"

doc/gridmap.job.Job-class.html

@@ -89,7 +89,7 @@ <h1 class="epydoc">Class Job</h1><p class="nomargin-top"><span class="codelink">
         <span class="summary-sig-arg">mem_free</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">1G</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">name</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">gridmap_job</code><code class="variable-quote">'</code></span>,
         <span class="summary-sig-arg">num_slots</span>=<span class="summary-sig-default">1</span>,
-        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>)</span><br />
+        <span class="summary-sig-arg">queue</span>=<span class="summary-sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>)</span><br />
       Initializes a new Job.</td>
           <td align="right" valign="top">
             <span class="codelink"><a href="gridmap.job-pysrc.html#Job.__init__">source&nbsp;code</a></span>
@@ -305,7 +305,7 @@ <h3 class="epydoc"><span class="sig"><span class="sig-name">__init__</span>(<spa
         <span class="sig-arg">mem_free</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">1G</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">name</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">gridmap_job</code><code class="variable-quote">'</code></span>,
         <span class="sig-arg">num_slots</span>=<span class="sig-default">1</span>,
-        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">'</code><code class="variable-string">nlp.q</code><code class="variable-quote">'</code></span>)</span>
+        <span class="sig-arg">queue</span>=<span class="sig-default"><code class="variable-quote">u'</code><code class="variable-string">all.q</code><code class="variable-quote">'</code></span>)</span>
     <br /><em class="fname">(Constructor)</em>
   </h3>
   </td><td align="right" valign="top"
@@ -427,7 +427,7 @@ <h3 class="epydoc">native_specification</h3>
 <table border="0" cellpadding="0" cellspacing="0" width="100%%">
   <tr>
     <td align="left" class="footer">
-    Generated by Epydoc 3.0.1 on Fri Jul 19 16:04:19 2013
+    Generated by Epydoc 3.0.1 on Tue Jul 23 11:30:40 2013
     </td>
     <td align="right" class="footer">
       <a target="mainFrame" href="http://epydoc.sourceforge.net"