Add OptCom methods and media analysis

micom-dev · Mar 27, 2017 · 27fb804 · 27fb804
1 parent 28fba6b
commit 27fb804
Show file tree

Hide file tree

Showing 17 changed files with 590 additions and 65 deletions.
diff --git a/docs/_sources/micom.rst.txt b/docs/_sources/micom.rst.txt
@@ -43,6 +43,14 @@ micom.logger module
     :undoc-members:
     :show-inheritance:
 
+micom.media module
+------------------
+
+.. automodule:: micom.media
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 micom.problems module
 ---------------------
 

diff --git a/docs/community.html b/docs/community.html
@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Building communities &mdash; micom 0.1.3+9.gf231ba4.dirty documentation</title>
+  <title>Building communities &mdash; micom 0.1.3+10.g28fba6b.dirty documentation</title>
 
 
 
@@ -35,7 +35,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="micom 0.1.3+9.gf231ba4.dirty documentation" href="index.html"/>
+    <link rel="top" title="micom 0.1.3+10.g28fba6b.dirty documentation" href="index.html"/>
         <link rel="next" title="micom package" href="micom.html"/>
         <link rel="prev" title="Installing micom" href="installing.html"/> 
 
@@ -811,7 +811,7 @@ <h1>Building communities<a class="headerlink" href="#Building-communities" title
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.1.3+9.gf231ba4.dirty',
+            VERSION:'0.1.3+10.g28fba6b.dirty',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,

diff --git a/docs/genindex.html b/docs/genindex.html
@@ -9,7 +9,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Index &mdash; micom 0.1.3+9.gf231ba4.dirty documentation</title>
+  <title>Index &mdash; micom 0.1.3+10.g28fba6b.dirty documentation</title>
 
 
 
@@ -36,7 +36,7 @@
         <link rel="index" title="Index"
               href="#"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="micom 0.1.3+9.gf231ba4.dirty documentation" href="index.html"/> 
+    <link rel="top" title="micom 0.1.3+10.g28fba6b.dirty documentation" href="index.html"/> 
 
 
   <script src="_static/js/modernizr.min.js"></script>
@@ -170,6 +170,7 @@ <h1 id="index">Index</h1>
  | <a href="#L"><strong>L</strong></a>
  | <a href="#M"><strong>M</strong></a>
  | <a href="#O"><strong>O</strong></a>
+ | <a href="#P"><strong>P</strong></a>
  | <a href="#R"><strong>R</strong></a>
  | <a href="#S"><strong>S</strong></a>
  | <a href="#T"><strong>T</strong></a>
@@ -187,10 +188,14 @@ <h2 id="A">A</h2>
       <li><a href="micom.html#micom.problems.add_dualized_optcom">add_dualized_optcom() (in module micom.problems)</a>
 </li>
       <li><a href="micom.html#micom.problems.add_lagrangian">add_lagrangian() (in module micom.problems)</a>
+</li>
+      <li><a href="micom.html#micom.media.add_linear_obj">add_linear_obj() (in module micom.media)</a>
 </li>
   </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="micom.html#micom.problems.add_linear_optcom">add_linear_optcom() (in module micom.problems)</a>
+</li>
+      <li><a href="micom.html#micom.media.add_mip_obj">add_mip_obj() (in module micom.media)</a>
 </li>
       <li><a href="micom.html#micom.problems.add_moma_optcom">add_moma_optcom() (in module micom.problems)</a>
 </li>
@@ -219,6 +224,10 @@ <h2 id="C">C</h2>
 
 <h2 id="D">D</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="micom.html#micom.community.default_excludes">default_excludes (in module micom.community)</a>
+</li>
+  </ul></td>
   <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="micom.html#micom.util.download_model">download_model() (in module micom.util)</a>
 </li>
@@ -231,6 +240,14 @@ <h2 id="E">E</h2>
       <li><a href="micom.html#micom.algorithms.euclidean">euclidean() (in module micom.algorithms)</a>
 </li>
   </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="micom.html#micom.Community.exchanges">exchanges (micom.Community attribute)</a>
+
+      <ul>
+        <li><a href="micom.html#micom.community.Community.exchanges">(micom.community.Community attribute)</a>
+</li>
+      </ul></li>
+  </ul></td>
 </tr></table>
 
 <h2 id="F">F</h2>
@@ -274,15 +291,21 @@ <h2 id="M">M</h2>
 </li>
       <li><a href="micom.data.html#module-micom.data">micom.data (module)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
       <li><a href="micom.html#module-micom.duality">micom.duality (module)</a>
 </li>
       <li><a href="micom.html#module-micom.logger">micom.logger (module)</a>
+</li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="micom.html#module-micom.media">micom.media (module)</a>
 </li>
       <li><a href="micom.html#module-micom.problems">micom.problems (module)</a>
 </li>
       <li><a href="micom.html#module-micom.util">micom.util (module)</a>
+</li>
+      <li><a href="micom.html#micom.media.minimal_medium">minimal_medium() (in module micom.media)</a>
+</li>
+      <li><a href="micom.html#micom.duality.model">model (in module micom.duality)</a>
 </li>
       <li><a href="micom.html#micom.Community.modification">modification (micom.Community attribute)</a>
 
@@ -321,6 +344,14 @@ <h2 id="O">O</h2>
   </ul></td>
 </tr></table>
 
+<h2 id="P">P</h2>
+<table style="width: 100%" class="indextable genindextable"><tr>
+  <td style="width: 33%; vertical-align: top;"><ul>
+      <li><a href="micom.html#micom.duality.prefix">prefix (in module micom.duality)</a>
+</li>
+  </ul></td>
+</tr></table>
+
 <h2 id="R">R</h2>
 <table style="width: 100%" class="indextable genindextable"><tr>
   <td style="width: 33%; vertical-align: top;"><ul>
@@ -389,7 +420,7 @@ <h2 id="T">T</h2>
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.1.3+9.gf231ba4.dirty',
+            VERSION:'0.1.3+10.g28fba6b.dirty',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,

diff --git a/docs/index.html b/docs/index.html
@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Welcome to micom &mdash; micom 0.1.3+9.gf231ba4.dirty documentation</title>
+  <title>Welcome to micom &mdash; micom 0.1.3+10.g28fba6b.dirty documentation</title>
 
 
 
@@ -35,7 +35,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="micom 0.1.3+9.gf231ba4.dirty documentation" href="#"/>
+    <link rel="top" title="micom 0.1.3+10.g28fba6b.dirty documentation" href="#"/>
         <link rel="next" title="Installing micom" href="installing.html"/> 
 
 
@@ -269,7 +269,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Pe
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.1.3+9.gf231ba4.dirty',
+            VERSION:'0.1.3+10.g28fba6b.dirty',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,

diff --git a/docs/installing.html b/docs/installing.html
@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>Installing micom &mdash; micom 0.1.3+9.gf231ba4.dirty documentation</title>
+  <title>Installing micom &mdash; micom 0.1.3+10.g28fba6b.dirty documentation</title>
 
 
 
@@ -35,7 +35,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="micom 0.1.3+9.gf231ba4.dirty documentation" href="index.html"/>
+    <link rel="top" title="micom 0.1.3+10.g28fba6b.dirty documentation" href="index.html"/>
         <link rel="next" title="Building communities" href="community.html"/>
         <link rel="prev" title="Welcome to micom" href="index.html"/> 
 
@@ -251,7 +251,7 @@ <h1>Installing micom<a class="headerlink" href="#Installing-micom" title="Permal
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.1.3+9.gf231ba4.dirty',
+            VERSION:'0.1.3+10.g28fba6b.dirty',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,

diff --git a/docs/micom.data.html b/docs/micom.data.html
@@ -8,7 +8,7 @@
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <title>micom.data package &mdash; micom 0.1.3+9.gf231ba4.dirty documentation</title>
+  <title>micom.data package &mdash; micom 0.1.3+10.g28fba6b.dirty documentation</title>
 
 
 
@@ -35,7 +35,7 @@
         <link rel="index" title="Index"
               href="genindex.html"/>
         <link rel="search" title="Search" href="search.html"/>
-    <link rel="top" title="micom 0.1.3+9.gf231ba4.dirty documentation" href="index.html"/>
+    <link rel="top" title="micom 0.1.3+10.g28fba6b.dirty documentation" href="index.html"/>
         <link rel="up" title="micom package" href="micom.html"/>
         <link rel="prev" title="micom package" href="micom.html"/> 
 
@@ -109,6 +109,7 @@
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.community">micom.community module</a></li>
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.duality">micom.duality module</a></li>
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.logger">micom.logger module</a></li>
+<li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.media">micom.media module</a></li>
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.problems">micom.problems module</a></li>
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom.util">micom.util module</a></li>
 <li class="toctree-l2"><a class="reference internal" href="micom.html#module-micom">Module contents</a></li>
@@ -281,7 +282,7 @@ <h1>micom.data package<a class="headerlink" href="#micom-data-package" title="Pe
     <script type="text/javascript">
         var DOCUMENTATION_OPTIONS = {
             URL_ROOT:'./',
-            VERSION:'0.1.3+9.gf231ba4.dirty',
+            VERSION:'0.1.3+10.g28fba6b.dirty',
             COLLAPSE_INDEX:false,
             FILE_SUFFIX:'.html',
             HAS_SOURCE:  true,