deploy: 2935332

Author: github-actions[bot]

api/_modules/aepsych/config.html

@@ -31,7 +31,7 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
 <span class="kn">import</span><span class="w"> </span><span class="nn">typing</span>
 <span class="kn">import</span><span class="w"> </span><span class="nn">warnings</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">types</span><span class="w"> </span><span class="kn">import</span> <span class="n">ModuleType</span><span class="p">,</span> <span class="n">NoneType</span><span class="p">,</span> <span class="n">UnionType</span>
-<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Callable</span><span class="p">,</span> <span class="n">ClassVar</span><span class="p">,</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">TypeVar</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Callable</span><span class="p">,</span> <span class="n">ClassVar</span><span class="p">,</span> <span class="n">Literal</span><span class="p">,</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">TypeVar</span>
 
 <span class="kn">import</span><span class="w"> </span><span class="nn">botorch</span>
 <span class="kn">import</span><span class="w"> </span><span class="nn">gpytorch</span>
@@ -258,9 +258,6 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
                     <span class="bp">self</span><span class="o">.</span><span class="n">_check_param_settings</span><span class="p">(</span><span class="n">par_name</span><span class="p">)</span>
 
                     <span class="k">if</span> <span class="bp">self</span><span class="p">[</span><span class="n">par_name</span><span class="p">][</span><span class="s2">"par_type"</span><span class="p">]</span> <span class="o">==</span> <span class="s2">"categorical"</span><span class="p">:</span>
-                        <span class="k">raise</span> <span class="ne">NotImplementedError</span><span class="p">(</span>
-                            <span class="s2">"Categorical parameters not supported yet"</span>
-                        <span class="p">)</span>
                         <span class="n">choices</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">getlist</span><span class="p">(</span><span class="n">par_name</span><span class="p">,</span> <span class="s2">"choices"</span><span class="p">,</span> <span class="n">element_type</span><span class="o">=</span><span class="nb">str</span><span class="p">)</span>
                         <span class="n">lb</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="s2">"0"</span>
                         <span class="n">ub</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">choices</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span><span class="p">)</span>
@@ -621,6 +618,31 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
                         <span class="k">else</span><span class="p">:</span>
                             <span class="n">value</span> <span class="o">=</span> <span class="n">object_cls</span>
 
+                    <span class="c1"># Literal (supporting strings, ints, floats)</span>
+                    <span class="k">elif</span> <span class="n">typing</span><span class="o">.</span><span class="n">get_origin</span><span class="p">(</span><span class="n">annotation</span><span class="p">)</span> <span class="ow">is</span> <span class="n">Literal</span><span class="p">:</span>
+                        <span class="n">literal_args</span> <span class="o">=</span> <span class="n">typing</span><span class="o">.</span><span class="n">get_args</span><span class="p">(</span><span class="n">annotation</span><span class="p">)</span>
+                        <span class="k">for</span> <span class="n">arg</span> <span class="ow">in</span> <span class="n">literal_args</span><span class="p">:</span>
+                            <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getint</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">float</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getfloat</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">else</span><span class="p">:</span>
+                                <span class="k">raise</span> <span class="ne">NotImplementedError</span><span class="p">(</span>
+                                    <span class="sa">f</span><span class="s2">"Literal types in </span><span class="si">{</span><span class="n">annotation</span><span class="si">}</span><span class="s2"> not supported yet!"</span>
+                                <span class="p">)</span>
+
+                            <span class="k">if</span> <span class="n">attempt</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+                                <span class="k">continue</span>
+
+                            <span class="k">if</span> <span class="n">attempt</span> <span class="ow">in</span> <span class="n">literal_args</span><span class="p">:</span>
+                                <span class="n">value</span> <span class="o">=</span> <span class="n">attempt</span>
+                            <span class="k">else</span><span class="p">:</span>
+                                <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span>
+                                    <span class="sa">f</span><span class="s2">"Value </span><span class="si">{</span><span class="n">attempt</span><span class="si">}</span><span class="s2"> is not in the Literal type </span><span class="si">{</span><span class="n">annotation</span><span class="si">}</span><span class="s2"> for the option </span><span class="si">{</span><span class="n">key</span><span class="si">}</span><span class="s2">!"</span>
+                                <span class="p">)</span>
+
                     <span class="c1"># Callable</span>
                     <span class="k">elif</span> <span class="n">annotation</span> <span class="ow">is</span> <span class="n">Callable</span><span class="p">:</span>
                         <span class="n">value</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getobj</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">)</span>

api/_modules/aepsych/config/index.html

@@ -31,7 +31,7 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
 <span class="kn">import</span><span class="w"> </span><span class="nn">typing</span>
 <span class="kn">import</span><span class="w"> </span><span class="nn">warnings</span>
 <span class="kn">from</span><span class="w"> </span><span class="nn">types</span><span class="w"> </span><span class="kn">import</span> <span class="n">ModuleType</span><span class="p">,</span> <span class="n">NoneType</span><span class="p">,</span> <span class="n">UnionType</span>
-<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Callable</span><span class="p">,</span> <span class="n">ClassVar</span><span class="p">,</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">TypeVar</span>
+<span class="kn">from</span><span class="w"> </span><span class="nn">typing</span><span class="w"> </span><span class="kn">import</span> <span class="n">Any</span><span class="p">,</span> <span class="n">Callable</span><span class="p">,</span> <span class="n">ClassVar</span><span class="p">,</span> <span class="n">Literal</span><span class="p">,</span> <span class="n">Mapping</span><span class="p">,</span> <span class="n">Sequence</span><span class="p">,</span> <span class="n">TypeVar</span>
 
 <span class="kn">import</span><span class="w"> </span><span class="nn">botorch</span>
 <span class="kn">import</span><span class="w"> </span><span class="nn">gpytorch</span>
@@ -258,9 +258,6 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
                     <span class="bp">self</span><span class="o">.</span><span class="n">_check_param_settings</span><span class="p">(</span><span class="n">par_name</span><span class="p">)</span>
 
                     <span class="k">if</span> <span class="bp">self</span><span class="p">[</span><span class="n">par_name</span><span class="p">][</span><span class="s2">"par_type"</span><span class="p">]</span> <span class="o">==</span> <span class="s2">"categorical"</span><span class="p">:</span>
-                        <span class="k">raise</span> <span class="ne">NotImplementedError</span><span class="p">(</span>
-                            <span class="s2">"Categorical parameters not supported yet"</span>
-                        <span class="p">)</span>
                         <span class="n">choices</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">getlist</span><span class="p">(</span><span class="n">par_name</span><span class="p">,</span> <span class="s2">"choices"</span><span class="p">,</span> <span class="n">element_type</span><span class="o">=</span><span class="nb">str</span><span class="p">)</span>
                         <span class="n">lb</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="s2">"0"</span>
                         <span class="n">ub</span><span class="p">[</span><span class="n">i</span><span class="p">]</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="nb">len</span><span class="p">(</span><span class="n">choices</span><span class="p">)</span> <span class="o">-</span> <span class="mi">1</span><span class="p">)</span>
@@ -621,6 +618,31 @@ <h1>Source code for aepsych.config</h1><div class="highlight"><pre>
                         <span class="k">else</span><span class="p">:</span>
                             <span class="n">value</span> <span class="o">=</span> <span class="n">object_cls</span>
 
+                    <span class="c1"># Literal (supporting strings, ints, floats)</span>
+                    <span class="k">elif</span> <span class="n">typing</span><span class="o">.</span><span class="n">get_origin</span><span class="p">(</span><span class="n">annotation</span><span class="p">)</span> <span class="ow">is</span> <span class="n">Literal</span><span class="p">:</span>
+                        <span class="n">literal_args</span> <span class="o">=</span> <span class="n">typing</span><span class="o">.</span><span class="n">get_args</span><span class="p">(</span><span class="n">annotation</span><span class="p">)</span>
+                        <span class="k">for</span> <span class="n">arg</span> <span class="ow">in</span> <span class="n">literal_args</span><span class="p">:</span>
+                            <span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">str</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">int</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getint</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">arg</span><span class="p">,</span> <span class="nb">float</span><span class="p">):</span>
+                                <span class="n">attempt</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getfloat</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">,</span> <span class="n">fallback</span><span class="o">=</span><span class="kc">None</span><span class="p">)</span>
+                            <span class="k">else</span><span class="p">:</span>
+                                <span class="k">raise</span> <span class="ne">NotImplementedError</span><span class="p">(</span>
+                                    <span class="sa">f</span><span class="s2">"Literal types in </span><span class="si">{</span><span class="n">annotation</span><span class="si">}</span><span class="s2"> not supported yet!"</span>
+                                <span class="p">)</span>
+
+                            <span class="k">if</span> <span class="n">attempt</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
+                                <span class="k">continue</span>
+
+                            <span class="k">if</span> <span class="n">attempt</span> <span class="ow">in</span> <span class="n">literal_args</span><span class="p">:</span>
+                                <span class="n">value</span> <span class="o">=</span> <span class="n">attempt</span>
+                            <span class="k">else</span><span class="p">:</span>
+                                <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span>
+                                    <span class="sa">f</span><span class="s2">"Value </span><span class="si">{</span><span class="n">attempt</span><span class="si">}</span><span class="s2"> is not in the Literal type </span><span class="si">{</span><span class="n">annotation</span><span class="si">}</span><span class="s2"> for the option </span><span class="si">{</span><span class="n">key</span><span class="si">}</span><span class="s2">!"</span>
+                                <span class="p">)</span>
+
                     <span class="c1"># Callable</span>
                     <span class="k">elif</span> <span class="n">annotation</span> <span class="ow">is</span> <span class="n">Callable</span><span class="p">:</span>
                         <span class="n">value</span> <span class="o">=</span> <span class="n">config</span><span class="o">.</span><span class="n">getobj</span><span class="p">(</span><span class="n">name</span><span class="p">,</span> <span class="n">key</span><span class="p">)</span>

demos/ParticleEffectDemo.html

@@ -64,7 +64,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 <div class="notebook">
-<div class="cell border-box-sizing text_cell rendered" id="cell-id=99690a7e"><div class="prompt input_prompt">
+<div class="cell border-box-sizing text_cell rendered" id="cell-id=c393b40d"><div class="prompt input_prompt">
 </div><div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 <h2 id="Particle-Effect-Demo">Particle Effect Demo<a class="anchor-link" href="#Particle-Effect-Demo">¶</a></h2><video controls="" muted="" style="width: 100%;">

demos/ParticleEffectDemo/index.html

@@ -64,7 +64,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 <div class="notebook">
-<div class="cell border-box-sizing text_cell rendered" id="cell-id=99690a7e"><div class="prompt input_prompt">
+<div class="cell border-box-sizing text_cell rendered" id="cell-id=c393b40d"><div class="prompt input_prompt">
 </div><div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 <h2 id="Particle-Effect-Demo">Particle Effect Demo<a class="anchor-link" href="#Particle-Effect-Demo">¶</a></h2><video controls="" muted="" style="width: 100%;">

demos/ThrowOptimizerDemo.html

@@ -64,7 +64,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 <div class="notebook">
-<div class="cell border-box-sizing text_cell rendered" id="cell-id=0da41245"><div class="prompt input_prompt">
+<div class="cell border-box-sizing text_cell rendered" id="cell-id=a1322baf"><div class="prompt input_prompt">
 </div><div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 <h2 id="VR-Throw-Optimizer-Demo">VR Throw Optimizer Demo<a class="anchor-link" href="#VR-Throw-Optimizer-Demo">¶</a></h2><video controls="" muted="" style="width: 100%;">

demos/ThrowOptimizerDemo/index.html

@@ -64,7 +64,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"></script>
 <div class="notebook">
-<div class="cell border-box-sizing text_cell rendered" id="cell-id=0da41245"><div class="prompt input_prompt">
+<div class="cell border-box-sizing text_cell rendered" id="cell-id=a1322baf"><div class="prompt input_prompt">
 </div><div class="inner_cell">
 <div class="text_cell_render border-box-sizing rendered_html">
 <h2 id="VR-Throw-Optimizer-Demo">VR Throw Optimizer Demo<a class="anchor-link" href="#VR-Throw-Optimizer-Demo">¶</a></h2><video controls="" muted="" style="width: 100%;">