Updated docs and p_values format

Fuminides · Oct 10, 2024 · fdae9e5 · fdae9e5
1 parent 95983f4
commit fdae9e5
Show file tree

Hide file tree

Showing 119 changed files with 3,349 additions and 1,395 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ tmp.prof
 iris_partitions.txt
 .vscode/settings.json
 *.gz
+test_data_set.csv
diff --git a/Demos/demos_module/iris_demo.py b/Demos/demos_module/iris_demo.py
@@ -21,7 +21,6 @@
 
 import sys
 
-import ex_fuzzy.fuzzy_sets as fs
 
 
 

diff --git a/docs/build/doctrees/api.doctree b/docs/build/doctrees/api.doctree
diff --git a/docs/build/doctrees/classifiers.doctree b/docs/build/doctrees/classifiers.doctree
diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle
diff --git a/docs/build/doctrees/extending.doctree b/docs/build/doctrees/extending.doctree
diff --git a/docs/build/doctrees/function_resume/centroid.doctree b/docs/build/doctrees/function_resume/centroid.doctree
diff --git a/docs/build/doctrees/function_resume/classifiers.doctree b/docs/build/doctrees/function_resume/classifiers.doctree
diff --git a/docs/build/doctrees/function_resume/cognitive_maps.doctree b/docs/build/doctrees/function_resume/cognitive_maps.doctree
diff --git a/docs/build/doctrees/function_resume/eval_rules.doctree b/docs/build/doctrees/function_resume/eval_rules.doctree
diff --git a/docs/build/doctrees/function_resume/eval_tools.doctree b/docs/build/doctrees/function_resume/eval_tools.doctree
diff --git a/docs/build/doctrees/function_resume/evolutionary_fit.doctree b/docs/build/doctrees/function_resume/evolutionary_fit.doctree
diff --git a/docs/build/doctrees/function_resume/fuzzy_sets.doctree b/docs/build/doctrees/function_resume/fuzzy_sets.doctree
diff --git a/docs/build/doctrees/function_resume/pattern_stability.doctree b/docs/build/doctrees/function_resume/pattern_stability.doctree
diff --git a/docs/build/doctrees/function_resume/persistence.doctree b/docs/build/doctrees/function_resume/persistence.doctree
diff --git a/docs/build/doctrees/function_resume/rule_mining.doctree b/docs/build/doctrees/function_resume/rule_mining.doctree
diff --git a/docs/build/doctrees/function_resume/rules.doctree b/docs/build/doctrees/function_resume/rules.doctree
diff --git a/docs/build/doctrees/function_resume/temporal.doctree b/docs/build/doctrees/function_resume/temporal.doctree
diff --git a/docs/build/doctrees/function_resume/utils.doctree b/docs/build/doctrees/function_resume/utils.doctree
diff --git a/docs/build/doctrees/function_resume/vis_rules.doctree b/docs/build/doctrees/function_resume/vis_rules.doctree
diff --git a/docs/build/doctrees/gt2.doctree b/docs/build/doctrees/gt2.doctree
diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree
diff --git a/docs/build/doctrees/optimize.doctree b/docs/build/doctrees/optimize.doctree
diff --git a/docs/build/doctrees/pattern_stats.doctree b/docs/build/doctrees/pattern_stats.doctree
diff --git a/docs/build/doctrees/persistence.doctree b/docs/build/doctrees/persistence.doctree
diff --git a/docs/build/doctrees/precom.doctree b/docs/build/doctrees/precom.doctree
diff --git a/docs/build/doctrees/step1.doctree b/docs/build/doctrees/step1.doctree
diff --git a/docs/build/doctrees/step2.doctree b/docs/build/doctrees/step2.doctree
diff --git a/docs/build/doctrees/step3.doctree b/docs/build/doctrees/step3.doctree
diff --git a/docs/build/doctrees/step4.doctree b/docs/build/doctrees/step4.doctree
diff --git a/docs/build/doctrees/tmpfs.doctree b/docs/build/doctrees/tmpfs.doctree
diff --git a/docs/build/doctrees/usage.doctree b/docs/build/doctrees/usage.doctree
diff --git a/docs/build/html/.buildinfo b/docs/build/html/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 7184ad333879fb5e4f199b3de50a2caf
+config: bbbf35d0940a0dcfa2922ad1d1125950
 tags: 645f666f9bcd5a90fca523b33c5a78b7
diff --git a/docs/build/html/_modules/ex_fuzzy/eval_rules.html b/docs/build/html/_modules/ex_fuzzy/eval_rules.html
diff --git a/docs/build/html/_modules/ex_fuzzy/eval_tools.html b/docs/build/html/_modules/ex_fuzzy/eval_tools.html
diff --git a/docs/build/html/_modules/ex_fuzzy/evolutionary_fit.html b/docs/build/html/_modules/ex_fuzzy/evolutionary_fit.html
diff --git a/docs/build/html/_modules/ex_fuzzy/fuzzy_sets.html b/docs/build/html/_modules/ex_fuzzy/fuzzy_sets.html
diff --git a/docs/build/html/_modules/ex_fuzzy/persistence.html b/docs/build/html/_modules/ex_fuzzy/persistence.html
@@ -1,22 +1,20 @@
+
+
 <!DOCTYPE html>
-<html class="writer-html5" lang="en">
+<html class="writer-html5" lang="en" data-content_root="../../">
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>ex_fuzzy.persistence &mdash; Ex-Fuzzy  documentation</title>
-      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css" />
-      <link rel="stylesheet" type="text/css" href="../../_static/css/theme.css" />
+      <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=80d5e7a1" />
+      <link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=7ab3649f" />
 
 
-  <!--[if lt IE 9]>
-    <script src="../../_static/js/html5shiv.min.js"></script>
-  <![endif]-->
-
-        <script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
-        <script src="../../_static/jquery.js"></script>
-        <script src="../../_static/underscore.js"></script>
-        <script src="../../_static/_sphinx_javascript_frameworks_compat.js"></script>
-        <script src="../../_static/doctools.js"></script>
+      <script src="../../_static/jquery.js?v=5d32c60e"></script>
+      <script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script>
+      <script src="../../_static/documentation_options.js?v=5929fcd5"></script>
+      <script src="../../_static/doctools.js?v=9a2dae69"></script>
+      <script src="../../_static/sphinx_highlight.js?v=dc90522c"></script>
     <script src="../../_static/js/theme.js"></script>
     <link rel="index" title="Index" href="../../genindex.html" />
     <link rel="search" title="Search" href="../../search.html" /> 
@@ -117,13 +115,21 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span><span class="n">pattern</span><span class="p">,</span> <span class="n">replacement</span><span class="p">,</span> <span class="n">text</span><span class="p">)</span>
 
 
-<div class="viewcode-block" id="load_fuzzy_rules"><a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.load_fuzzy_rules">[docs]</a><span class="k">def</span> <span class="nf">load_fuzzy_rules</span><span class="p">(</span><span class="n">rules_printed</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">fuzzy_variables</span><span class="p">:</span> <span class="nb">list</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">rules</span><span class="o">.</span><span class="n">MasterRuleBase</span><span class="p">:</span>
+<span class="kn">import</span> <span class="nn">re</span>
+
+<span class="k">def</span> <span class="nf">remove_parentheses</span><span class="p">(</span><span class="n">text</span><span class="p">):</span>
+    <span class="k">return</span> <span class="n">re</span><span class="o">.</span><span class="n">sub</span><span class="p">(</span><span class="sa">r</span><span class="s1">&#39;\(.*?\)&#39;</span><span class="p">,</span> <span class="s1">&#39;&#39;</span><span class="p">,</span> <span class="n">text</span><span class="p">)</span>
+
+
+<div class="viewcode-block" id="load_fuzzy_rules">
+<a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.load_fuzzy_rules">[docs]</a>
+<span class="k">def</span> <span class="nf">load_fuzzy_rules</span><span class="p">(</span><span class="n">rules_printed</span><span class="p">:</span> <span class="nb">str</span><span class="p">,</span> <span class="n">fuzzy_variables</span><span class="p">:</span> <span class="nb">list</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="n">rules</span><span class="o">.</span><span class="n">MasterRuleBase</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&#39;&#39;&#39;</span>
 <span class="sd">    Load the rules from a string.</span>
 <span class="sd">    </span>
 <span class="sd">    :param rules_printed: string with the rules. Follows the specification given by the same printing method of rules.MasterRuleBase</span>
 <span class="sd">    :param fuzzy_variables: list with the linguistic variables. Objects of FuzzyVariable class.</span>
-<span class="sd">    </span>
+<span class="sd">    :return mrule_base: object of MasterRuleBase class that contains the rules.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="k">if</span> <span class="n">mnt</span><span class="o">.</span><span class="n">save_usage_flag</span><span class="p">:</span>
         <span class="n">mnt</span><span class="o">.</span><span class="n">usage_data</span><span class="p">[</span><span class="n">mnt</span><span class="o">.</span><span class="n">usage_categories</span><span class="o">.</span><span class="n">Persistence</span><span class="p">][</span><span class="s1">&#39;persistence_read&#39;</span><span class="p">]</span> <span class="o">+=</span> <span class="mi">1</span>
@@ -146,7 +152,8 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
                     <span class="n">rule_acc</span> <span class="o">=</span> <span class="n">stat</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
                 <span class="k">elif</span> <span class="s1">&#39;WGHT&#39;</span> <span class="ow">in</span> <span class="n">stat</span><span class="p">:</span>
                     <span class="n">rule_weight</span> <span class="o">=</span> <span class="n">stat</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
-
+
+            <span class="n">consequent_ds</span> <span class="o">=</span> <span class="n">remove_parentheses</span><span class="p">(</span><span class="n">consequent_ds</span><span class="p">)</span>
             <span class="n">consequent_ds</span> <span class="o">=</span> <span class="n">consequent_ds</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;,&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span><span class="o">.</span><span class="n">strip</span><span class="p">()</span>
             <span class="n">modifiers</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">ones</span><span class="p">((</span><span class="nb">len</span><span class="p">(</span><span class="n">fuzzy_variables</span><span class="p">),))</span>
             <span class="n">init_rule_antecedents</span> <span class="o">=</span> <span class="n">np</span><span class="o">.</span><span class="n">zeros</span><span class="p">(</span>
@@ -216,12 +223,15 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">mrule_base</span></div>
 
 
-<div class="viewcode-block" id="load_fuzzy_variables"><a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.load_fuzzy_variables">[docs]</a><span class="k">def</span> <span class="nf">load_fuzzy_variables</span><span class="p">(</span><span class="n">fuzzy_variables_printed</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">:</span>
+
+<div class="viewcode-block" id="load_fuzzy_variables">
+<a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.load_fuzzy_variables">[docs]</a>
+<span class="k">def</span> <span class="nf">load_fuzzy_variables</span><span class="p">(</span><span class="n">fuzzy_variables_printed</span><span class="p">:</span> <span class="nb">str</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">list</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&#39;&#39;&#39;</span>
 <span class="sd">    Load the linguistic variables from a string.</span>
 <span class="sd">    </span>
 <span class="sd">    :param fuzzy_variables_printed: string with the linguistic variables. Follows the specification given by the same printing method of FuzzyVariable class.</span>
-<span class="sd">    </span>
+<span class="sd">    :return fuzzy_variables: list with the linguistic variables. Objects of FuzzyVariable class.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="k">if</span> <span class="n">mnt</span><span class="o">.</span><span class="n">save_usage_flag</span><span class="p">:</span>
         <span class="n">mnt</span><span class="o">.</span><span class="n">usage_data</span><span class="p">[</span><span class="n">mnt</span><span class="o">.</span><span class="n">usage_categories</span><span class="o">.</span><span class="n">Persistence</span><span class="p">][</span><span class="s1">&#39;persistence_read&#39;</span><span class="p">]</span> <span class="o">+=</span> <span class="mi">1</span>
@@ -297,12 +307,15 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">fuzzy_variables</span></div>
 
 
-<div class="viewcode-block" id="print_fuzzy_variable"><a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.print_fuzzy_variable">[docs]</a><span class="k">def</span> <span class="nf">print_fuzzy_variable</span><span class="p">(</span><span class="n">fuzzy_variable</span><span class="p">:</span> <span class="n">fs</span><span class="o">.</span><span class="n">fuzzyVariable</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
+
+<div class="viewcode-block" id="print_fuzzy_variable">
+<a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.print_fuzzy_variable">[docs]</a>
+<span class="k">def</span> <span class="nf">print_fuzzy_variable</span><span class="p">(</span><span class="n">fuzzy_variable</span><span class="p">:</span> <span class="n">fs</span><span class="o">.</span><span class="n">fuzzyVariable</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&#39;&#39;&#39;</span>
 <span class="sd">    Save the linguistic variable to a string.</span>
 <span class="sd">    </span>
 <span class="sd">    :param fuzzy_variable: linguistic variable. Object of FuzzyVariable class.</span>
-<span class="sd">    </span>
+<span class="sd">    :return fuzzy_variable_printed: string with the linguistic variable. Follows the specification given by the same printing method of FuzzyVariable class.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="k">if</span> <span class="n">mnt</span><span class="o">.</span><span class="n">save_usage_flag</span><span class="p">:</span>
         <span class="n">mnt</span><span class="o">.</span><span class="n">usage_data</span><span class="p">[</span><span class="n">mnt</span><span class="o">.</span><span class="n">usage_categories</span><span class="o">.</span><span class="n">Persistence</span><span class="p">][</span><span class="s1">&#39;persistence_write&#39;</span><span class="p">]</span> <span class="o">+=</span> <span class="mi">1</span>
@@ -335,12 +348,15 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
     <span class="k">return</span> <span class="n">fuzzy_variable_printed</span></div>
 
 
-<div class="viewcode-block" id="save_fuzzy_variables"><a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.save_fuzzy_variables">[docs]</a><span class="k">def</span> <span class="nf">save_fuzzy_variables</span><span class="p">(</span><span class="n">fuzzy_variables</span><span class="p">:</span> <span class="nb">list</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
+
+<div class="viewcode-block" id="save_fuzzy_variables">
+<a class="viewcode-back" href="../../function_resume/persistence.html#ex_fuzzy.persistence.save_fuzzy_variables">[docs]</a>
+<span class="k">def</span> <span class="nf">save_fuzzy_variables</span><span class="p">(</span><span class="n">fuzzy_variables</span><span class="p">:</span> <span class="nb">list</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
 <span class="w">    </span><span class="sd">&#39;&#39;&#39;</span>
 <span class="sd">    Save the linguistic variables to a string.</span>
 <span class="sd">    </span>
 <span class="sd">    :param fuzzy_variables: list with the linguistic variables. Objects of FuzzyVariable class.</span>
-<span class="sd">    </span>
+<span class="sd">    :return fuzzy_variables_printed: string with the linguistic variables. Follows the specification given by the same printing method of FuzzyVariable class.</span>
 <span class="sd">    &#39;&#39;&#39;</span>
     <span class="k">if</span> <span class="n">mnt</span><span class="o">.</span><span class="n">save_usage_flag</span><span class="p">:</span>
         <span class="n">mnt</span><span class="o">.</span><span class="n">usage_data</span><span class="p">[</span><span class="n">mnt</span><span class="o">.</span><span class="n">usage_categories</span><span class="o">.</span><span class="n">Persistence</span><span class="p">][</span><span class="s1">&#39;persistence_write&#39;</span><span class="p">]</span> <span class="o">+=</span> <span class="mi">1</span>
@@ -350,6 +366,7 @@ <h1>Source code for ex_fuzzy.persistence</h1><div class="highlight"><pre>
         <span class="n">fuzzy_variables_printed</span> <span class="o">+=</span> <span class="n">print_fuzzy_variable</span><span class="p">(</span><span class="n">fvar</span><span class="p">)</span> <span class="o">+</span> <span class="s1">&#39;</span><span class="se">\n</span><span class="s1">&#39;</span>
 
     <span class="k">return</span> <span class="n">fuzzy_variables_printed</span></div>
+
 </pre></div>
 
            </div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,7 +21,6 @@

		import sys

		import ex_fuzzy.fuzzy_sets as fs



Expand Down