Skip to content

Commit

Permalink
update doc to include cartn_append() also rename cart2_append()
Browse files Browse the repository at this point in the history
  • Loading branch information
Yuhang(Steven) Wang committed Jun 25, 2016
1 parent 712d382 commit 98eef87
Show file tree
Hide file tree
Showing 45 changed files with 972 additions and 213 deletions.
9 changes: 5 additions & 4 deletions FunctionalX/src/lists/_cartn_append.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
def cartn_append(*list_of_lists: list) -> list:
"""Cartesian product of n lists.
The difference from `cartn` is that the first list
is a list of lists and the elements of subsequent lists
are appended (inserted) to each sub-list of the first list
in a functionally recursive way.
The difference from `cartn` is that the first element
of the input `list_of_lists`
is itself a list of lists.
The elements from other lists
are appended (inserted) to each sub-list of the first list.
:param list list_of_lists(vararg): variable number of lists
:return: a new list
Expand Down
Binary file modified doc/_build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified doc/_build/doctrees/index.doctree
View file
Binary file not shown.
Binary file added doc/_build/doctrees/lists/cart2_append.doctree
View file
Binary file not shown.
Binary file modified doc/_build/doctrees/lists/cartn.doctree
View file
Binary file not shown.
Binary file added doc/_build/doctrees/lists/cartn_append.doctree
View file
Binary file not shown.
Binary file modified doc/_build/doctrees/lists/toc.doctree
View file
Binary file not shown.
1 change: 0 additions & 1 deletion doc/_build/html/_modules/FunctionalX/src/lists/_cart2.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@

<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../lists/toc.html">lists</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../api/modules.html">FunctionalX</a></li>
</ul>


Expand Down
221 changes: 221 additions & 0 deletions doc/_build/html/_modules/FunctionalX/src/lists/_cart2_append.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@


<!DOCTYPE html>
<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
<head>
<meta charset="utf-8">

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>FunctionalX.src.lists._cart2_append &mdash; FunctionalX.py 0.0.1 documentation</title>















<link rel="stylesheet" href="../../../../_static/css/theme.css" type="text/css" />





<link rel="top" title="FunctionalX.py 0.0.1 documentation" href="../../../../index.html"/>
<link rel="up" title="Module code" href="../../../index.html"/>


<script src="../../../../_static/js/modernizr.min.js"></script>

</head>

<body class="wy-body-for-nav" role="document">

<div class="wy-grid-for-nav">


<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search">



<a href="../../../../index.html" class="icon icon-home"> FunctionalX.py



</a>




<div class="version">
0.0.1
</div>




<div role="search">
<form id="rtd-search-form" class="wy-form" action="../../../../search.html" method="get">
<input type="text" name="q" placeholder="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>


</div>

<div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">



<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../lists/toc.html">lists</a></li>
</ul>



</div>
</div>
</nav>

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">


<nav class="wy-nav-top" role="navigation" aria-label="top navigation">
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="../../../../index.html">FunctionalX.py</a>
</nav>



<div class="wy-nav-content">
<div class="rst-content">






<div role="navigation" aria-label="breadcrumbs navigation">
<ul class="wy-breadcrumbs">
<li><a href="../../../../index.html">Docs</a> &raquo;</li>

<li><a href="../../../index.html">Module code</a> &raquo;</li>

<li>FunctionalX.src.lists._cart2_append</li>
<li class="wy-breadcrumbs-aside">



</li>
</ul>
<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">

<h1>Source code for FunctionalX.src.lists._cart2_append</h1><div class="highlight"><pre>
<div class="viewcode-block" id="cart2_append"><a class="viewcode-back" href="../../../../lists/cart2_append.html#FunctionalX.src.lists._cart2_append.cart2_append">[docs]</a><span></span><span class="k">def</span> <span class="nf">cart2_append</span><span class="p">(</span><span class="n">list1</span><span class="p">,</span> <span class="n">list2</span><span class="p">):</span>
<span class="sd">&quot;&quot;&quot;Append items from list2 to list1 for all possible pairs.</span>

<span class="sd"> Append an element from the second list to the each element from the first list</span>
<span class="sd"> therefore increase the number of elements in each item in the first list.</span>

<span class="sd"> :param list list1: input list 1</span>
<span class="sd"> :param list list2: input list 2</span>

<span class="sd"> :return: a new list.</span>
<span class="sd"> :rtype: list</span>

<span class="sd"> &gt;&gt;&gt; cart_append([[1,2]], [&#39;a&#39;,&#39;b&#39;]) </span>
<span class="sd"> [[1,2,&#39;a&#39;], [1,2,&#39;b&#39;]]</span>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="k">def</span> <span class="nf">others</span><span class="p">(</span><span class="n">list1</span><span class="p">):</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">list1</span><span class="p">)</span> <span class="o">&lt;=</span> <span class="mi">1</span><span class="p">:</span>
<span class="k">return</span> <span class="p">[]</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">return</span> <span class="n">list1</span><span class="p">[</span><span class="mi">1</span><span class="p">:]</span>

<span class="k">def</span> <span class="nf">aux</span><span class="p">(</span><span class="n">list1</span><span class="p">,</span> <span class="n">list2</span><span class="p">,</span> <span class="n">accum</span><span class="p">):</span>
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">list1</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span> <span class="ow">or</span> <span class="nb">len</span><span class="p">(</span><span class="n">list2</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">return</span> <span class="n">accum</span>
<span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">list1</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="nb">list</span><span class="p">):</span>
<span class="k">return</span> <span class="n">aux</span><span class="p">(</span><span class="n">others</span><span class="p">(</span><span class="n">list1</span><span class="p">),</span> <span class="n">list2</span><span class="p">,</span> <span class="n">aux</span><span class="p">(</span><span class="n">list1</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span> <span class="n">list2</span><span class="p">,</span> <span class="n">accum</span><span class="p">))</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">return</span> <span class="n">aux</span><span class="p">(</span><span class="n">list1</span><span class="p">,</span> <span class="n">others</span><span class="p">(</span><span class="n">list2</span><span class="p">),</span> <span class="n">accum</span> <span class="o">+</span> <span class="p">[</span><span class="n">list1</span> <span class="o">+</span> <span class="p">[</span><span class="n">list2</span><span class="p">[</span><span class="mi">0</span><span class="p">]]])</span>

<span class="k">return</span> <span class="n">aux</span><span class="p">(</span><span class="n">list1</span><span class="p">,</span> <span class="n">list2</span><span class="p">,</span> <span class="p">[])</span></div>
</pre></div>

</div>
</div>
<footer>


<hr/>

<div role="contentinfo">
<p>
&copy; Copyright 2016, Yuhang(Steven) Wang.

</p>
</div>
Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>.

</footer>

</div>
</div>

</section>

</div>





<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'../../../../',
VERSION:'0.0.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
};
</script>
<script type="text/javascript" src="../../../../_static/jquery.js"></script>
<script type="text/javascript" src="../../../../_static/underscore.js"></script>
<script type="text/javascript" src="../../../../_static/doctools.js"></script>
<script type="text/javascript" src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>





<script type="text/javascript" src="../../../../_static/js/theme.js"></script>




<script type="text/javascript">
jQuery(function () {
SphinxRtdTheme.StickyNav.enable();
});
</script>


</body>
</html>
1 change: 0 additions & 1 deletion doc/_build/html/_modules/FunctionalX/src/lists/_cart_append.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@

<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../lists/toc.html">lists</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../api/modules.html">FunctionalX</a></li>
</ul>


Expand Down
5 changes: 2 additions & 3 deletions doc/_build/html/_modules/FunctionalX/src/lists/_cartn.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@

<ul>
<li class="toctree-l1"><a class="reference internal" href="../../../../lists/toc.html">lists</a></li>
<li class="toctree-l1"><a class="reference internal" href="../../../../api/modules.html">FunctionalX</a></li>
</ul>


Expand Down Expand Up @@ -128,7 +127,7 @@
<div itemprop="articleBody">

<h1>Source code for FunctionalX.src.lists._cartn</h1><div class="highlight"><pre>
<span></span><span class="kn">from</span> <span class="nn">._cart_append</span> <span class="kn">import</span> <span class="n">cart_append</span>
<span></span><span class="kn">from</span> <span class="nn">._cart2_append</span> <span class="kn">import</span> <span class="n">cart2_append</span>
<span class="kn">from</span> <span class="nn">._cart2</span> <span class="kn">import</span> <span class="n">cart2</span>
<span class="kn">from</span> <span class="nn">._tail</span> <span class="kn">import</span> <span class="n">tail</span>

Expand All @@ -146,7 +145,7 @@ <h1>Source code for FunctionalX.src.lists._cartn</h1><div class="highlight"><pre
<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">lists</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">return</span> <span class="n">base_list</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">return</span> <span class="n">aux</span><span class="p">(</span><span class="n">cart_append</span><span class="p">(</span><span class="n">base_list</span><span class="p">,</span> <span class="n">lists</span><span class="p">[</span><span class="mi">0</span><span class="p">]),</span> <span class="n">tail</span><span class="p">(</span><span class="n">lists</span><span class="p">))</span>
<span class="k">return</span> <span class="n">aux</span><span class="p">(</span><span class="n">cart2_append</span><span class="p">(</span><span class="n">base_list</span><span class="p">,</span> <span class="n">lists</span><span class="p">[</span><span class="mi">0</span><span class="p">]),</span> <span class="n">tail</span><span class="p">(</span><span class="n">lists</span><span class="p">))</span>

<span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">all_lists</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
<span class="k">return</span> <span class="p">[]</span>
Expand Down

0 comments on commit 98eef87

Please sign in to comment.