From f954b5c04b8d599b19c4866c6a3ab3616a7d8d3d Mon Sep 17 00:00:00 2001
From: daviddoret <david.doret@me.com>
Date: Sun, 22 Dec 2024 21:23:03 +0100
Subject: [PATCH] foundations

---
 .idea/workspace.xml                           |  33 +++++++--------
 src/punctilious/__init__.py                   |   2 +-
 .../__pycache__/__init__.cpython-312.pyc      | Bin 1915 -> 1947 bytes
 .../_tao_analysis_1_2006.cpython-312.pyc      | Bin 2477 -> 0 bytes
 .../tao_analysis_1_2006.cpython-312.pyc       | Bin 0 -> 1066 bytes
 src/punctilious/_tao_analysis_1_2006.py       |  39 ------------------
 .../data/mappings/tao_analysis_1_2006.yaml    |   8 ++--
 .../representations/tao_analysis_1_2006.yaml  |   8 ++--
 src/punctilious/tao_analysis_1_2006.py        |  16 +++++++
 9 files changed, 40 insertions(+), 66 deletions(-)
 delete mode 100644 src/punctilious/__pycache__/_tao_analysis_1_2006.cpython-312.pyc
 create mode 100644 src/punctilious/__pycache__/tao_analysis_1_2006.cpython-312.pyc
 delete mode 100644 src/punctilious/_tao_analysis_1_2006.py
 create mode 100644 src/punctilious/tao_analysis_1_2006.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index cffea53e..f694df22 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,15 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="48b609c4-0198-44a9-8f40-0a1e1f4ae31e" name="Changes" comment="first theorem implementation">
-      <change afterPath="$PROJECT_DIR$/src/punctilious/greek_alphabet_lowercase_serif_italic.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/punctilious/tao_analysis_1_2006.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/punctilious/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/_formula_notations.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/_greek_alphabet_lowercase_serif_italic.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/_greek_alphabet_uppercase_serif_italic.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/greek_alphabet_uppercase_serif_italic.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/formula_notations.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/formula_notations.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/latin_alphabet_lowercase_serif_italic.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/latin_alphabet_lowercase_serif_italic.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/punctilious/latin_alphabet_uppercase_serif_italic.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/latin_alphabet_uppercase_serif_italic.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/punctilious/_tao_analysis_1_2006.py" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/punctilious/data/mappings/tao_analysis_1_2006.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/data/mappings/tao_analysis_1_2006.yaml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/punctilious/data/representations/tao_analysis_1_2006.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/src/punctilious/data/representations/tao_analysis_1_2006.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -470,7 +467,7 @@
       <recent name="$PROJECT_DIR$/src/punctilious/data2/mappings" />
     </key>
   </component>
-  <component name="RunManager" selected="Python tests.pytest in tests">
+  <component name="RunManager" selected="Python tests.pytest for test_formula.TestFormula.test_formula">
     <configuration name="build" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
       <module name="2023_05_02_PyCharmProject_Maths" />
       <option name="ENV_FILES" value="" />
@@ -818,8 +815,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Python tests.pytest in tests" />
         <item itemvalue="Python tests.pytest for test_formula.TestFormula.test_formula" />
+        <item itemvalue="Python tests.pytest in tests" />
         <item itemvalue="Python tests.pytest for test_interpretation.TestRepresentation.test_representation" />
         <item itemvalue="Python tests.pytest in test_packaging.py" />
         <item itemvalue="Python tests.pytest in test_formula_notations.py" />
@@ -842,14 +839,6 @@
       <option name="presentableId" value="Default" />
       <updated>1687980987309</updated>
     </task>
-    <task id="LOCAL-01188" summary="identifiers">
-      <option name="closed" value="true" />
-      <created>1733693312501</created>
-      <option name="number" value="01188" />
-      <option name="presentableId" value="LOCAL-01188" />
-      <option name="project" value="LOCAL" />
-      <updated>1733693312501</updated>
-    </task>
     <task id="LOCAL-01189" summary="identifiers">
       <option name="closed" value="true" />
       <created>1733693460844</created>
@@ -1234,7 +1223,15 @@
       <option name="project" value="LOCAL" />
       <updated>1734858323019</updated>
     </task>
-    <option name="localTasksCounter" value="1237" />
+    <task id="LOCAL-01237" summary="first theorem implementation">
+      <option name="closed" value="true" />
+      <created>1734869320468</created>
+      <option name="number" value="01237" />
+      <option name="presentableId" value="LOCAL-01237" />
+      <option name="project" value="LOCAL" />
+      <updated>1734869320468</updated>
+    </task>
+    <option name="localTasksCounter" value="1238" />
     <servers>
       <YouTrack url="https://punctilious.youtrack.cloud">
         <username>random</username>
diff --git a/src/punctilious/__init__.py b/src/punctilious/__init__.py
index 910e314c..451b823b 100644
--- a/src/punctilious/__init__.py
+++ b/src/punctilious/__init__.py
@@ -31,7 +31,7 @@
 from _declarations import declare_variable, declare_function
 
 # import _propositional_logic_1
-# import _tao_analysis_1_2006
+import tao_analysis_1_2006
 
 prefs = _representation.TagsPreferences()
 packages = _bundling.get_packages()
diff --git a/src/punctilious/__pycache__/__init__.cpython-312.pyc b/src/punctilious/__pycache__/__init__.cpython-312.pyc
index 456e4cb1e51dc909f861062d58dbad29e82cfcfe..132565f74bcb8e8a98fb60a04c2bcb5cf619ab13 100644
GIT binary patch
delta 146
zcmey(H=CdLG%qg~0}w0~%SgAL$ScV>VWYY!BS#8D3S*98l;PwUMnz>KCWchitTd1^
zRInP#jWXH1fN=#Aqv>W(77iv6;gZDs_{6-#oXX<N;&{V&BLf4o$pLINT-HGKj6htx
aVDdG#GLFw|42;qbIMgQxva7LJ0>uHeogV)H

delta 98
zcmbQu|C^8ZG%qg~0}#kEW~AFq<dtOX*r;yG$i~Ew%9o`xxrb4j-4MuD%}N2W8I3ou
uU|hk(XtFtwg@b8w9$Ph+6;LlD5Esv#{F$wc^#d0Jr^e($b~P3YpdbKVFBUlf

diff --git a/src/punctilious/__pycache__/_tao_analysis_1_2006.cpython-312.pyc b/src/punctilious/__pycache__/_tao_analysis_1_2006.cpython-312.pyc
deleted file mode 100644
index 38e1c3c59b3e22b49b419ddbe085119b7ba4c137..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2477
zcmcImO>7fK6rNeHosECu@RJ`%Qf)$tuz(~^2nra5zn0(DjRdHw4;?MLYqMs(>&~v5
z+A<JTk?KgT(o4mmt;7|DL#p=BWADA#3X<K0L#3X2i<%%IPJOfXCI&(|bt1ogGw+)>
z?{D7Z_edm&V0?L;WP|`hf3b--{4HkV0x<WHf)uQyRP&2d*qw7Jjzbrb!Yv}jr*c`)
z@#<LdHCIx65y$wy*(52qgIaR5QGwO3;3O3>?I}*dDWAfnc=-7%D2)~0qL2!>91mQF
zDky%nGrPB4S(8t5N??&+X$exH|3r4QA;T5)1x`h-p_t%wUzg0YhNKrQ&5BP>OdKyI
z&WibhA={d+nFUMCOY&_gql#u)oL6=I=xxKCH^iJ|-%^2SvZRY<UZs+4Qfn+J<2E~4
zoS5GmSy=rJ-$!MXZ4-NJmh-sn@4^qZml?EEycMi)k9;ewop<nC&=B1=H1`&?|0T4q
zjLTfvm-gM^ZNal}$zMj_^dMB`9|cxgK4YYG?Cc@gii#caG-SIxZu{%yGP`Sg&Epio
z-sACQ<em9FQaXS1c{7ZP@D~dvOHoC#r7_tw3{_^CDfQcuNu*YyNu01$j}@hy9^)K7
z57~4Cs#<1&%4%t^yP2waSWyidvTPbwDdMi?q<mg8GFA*b9XAVxqN~>R(l8W}=v9#z
z7Y{M*G0_5`uG*#{9x8RkM9t7_P13cJs*J^gPA4I<E?E{KPA}Plk~S1T+#^7Z)Ab41
zdO_3GbMB#z-zq@WIRbGvfDS(?K*>76jA|3z%w$05SJaz@jKgV4Ea32#s;8acc1WD)
zD;_$6=Nx5urky}6R>LA23omYr->_6_jVsdUnxdFgwa4d*@-2zx=BSy4I9uaw7iZj}
z@=J5FQwH)y%IcuB@6~HK<~bH(R{R9y`2uQ$qRX>Ov-QwKEi_RL%{-ktRiC<Ao4VTQ
zIoQ}Ywdv=MO;@gL2GEIfxIQyio0)6$9Bv9uOjkYv!DONyzg&x7ZuE>c*C(edm(~NQ
zf8@dG)l1dh*~-PI;ay7?YvI8MA6LVJkHbeB$7U+;Ehm?fkHc}0)x(1zTnoQb50BQu
zqmA8DznojOf4;PO^4CwR-5)&j;Ybp%51{ag4KNzL)DT!Rh{A6}0rKXCu+VRBwFH|7
zs5{`o!QSoCFC*fK-q2W}!Qo_#cY@pHMcMtMOsCU9h@s9C0sx<^TMjSLjO7Gw&$Dkc
z`3%QWPy5)e0U)LR9TMfL83d_y7>JvvE|#ZiX!z;S$m0W3tJi8nXMa1eHgutK{_A8T
zx_kNV(%q^sMEe2n1fY@%)OamYZtI)@#2Xu@_ox8I8w&QC0eH_PoldJD%c^CW^dU#t
zBjW5~HzZBX9MKfG-C9~x=|fCebFo;T5}V!*16$hvnzvi(nA~D<SwMeA_blIAx>t`*
z)}oWEiM8nIs&Lx%?f>zKFR9d|BXBkyWmdFVeGulQp4Y5q8{TEmoeVy{7Cl)NPPzui
zx>!pwq?`&ZB}holR0=xd!-RZRko1-WYDY0;Lg;>G1pDv8y~b{dI6|JX7tt;{-6U<&
zoTL+7GBO2tMV-#`UQ4DdfRx$mL|UCthW8cf5jTsEd3C0l3s#42(Xwu2$v~bjqCfce
z8@qZIt~7>*tNi{=KI%{6%@Lpfo%J9JbggsPe+E|v4%Y{!YXj5&AU56bZAswHH$jPN
z@4<TSM6Gv%VG=H66E-K@c(|v={FL2VdV~?ykDSnl1>M$~t=NS;L`^u0?+f8nGi<Xo
o4pZibB?4LZVT_-k@DtSc1a)r)hH>KCV!iK3t?$S)1QS=ozs8z4h5!Hn

diff --git a/src/punctilious/__pycache__/tao_analysis_1_2006.cpython-312.pyc b/src/punctilious/__pycache__/tao_analysis_1_2006.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..fff5a4c44696ae47cb350852c3c055f24af403ca
GIT binary patch
literal 1066
zcmb7DKTq306u)zfAu$P5LKLYBQUXdUO#X*Nq6}1ms?e4JhGsdPeV5?K@kMubrDS64
zH|SSrRX#)2y$hLwOovLHx*@@YI`kZxhDb2<2EX@y@BQAt^L>lQV?dtY-f=S)0pMq7
zjE?$Ox!QpMd;mv)00JFQzm>2Khqh8z6hM`hHlmFsQAp%e{jA&~b@joxsfoC$2jjGf
zIE|{U#JJi>YdsoiV@amT%xUyrCs7Jp3uEs{qdJLgO5;EB>JxcqAIv)&=Iz2v{8w1)
zb#IPf53gIyb*besE_zEIW(d33=?Yt*JSyaJmGv%eI~gTVJJ>r8W;hkh=N9cP49T2!
zBtl&edp2`LFFr)uxYM!Srs$;_)pEX4G#f^-nkPmn-@t}ROw-uNS)@=k&1#`y9%f*$
z#IY?XqMS31>;`g~hZ@XxNe~sjWl<p*@1?5cT496Yyiu-Hs8K4GYKDo;no+Bk$|f%2
zl36PTYL9Z3i3d~2_iQJamw9*_JIKLq)5lF3M3E^IJF>wb@m3DEV>@&^L};Lg!=i=+
zQ2wq_xN8)H*m!3_yh&xNoVAhf+k}UIU=V#i+G#L{<U-{%xBEeePs@N$;3~X<o5Spp
zpj>1LerFTHIQ6mzUF#V0_5o)tc_|{>@m))fVKZN31-B;b`);e#y_wl;GvYgRi!aI|
z^4S3KMSd<L5W??Z_5wV<0P{Z*tMBbWVzr-GJzINro_l#6fph!tM4xbM-|zVN<_><T
zflO(T-s-2f2I>8NdjDK~`t|TK0y3}Q6@ZyNcoIF+pA7VszP=&>xCbRAl^rB&{bX&B
f-0dfKN0iiykdl%V^-NnFXv=+V`Fcp<;Zyko4iyr3

literal 0
HcmV?d00001

diff --git a/src/punctilious/_tao_analysis_1_2006.py b/src/punctilious/_tao_analysis_1_2006.py
deleted file mode 100644
index c6e39d72..00000000
--- a/src/punctilious/_tao_analysis_1_2006.py
+++ /dev/null
@@ -1,39 +0,0 @@
-import _util
-import _formal_language
-import _bundling
-
-
-class TaoAnalysis12006(_bundling.MultiBundle):
-    """A punctilious package of well-known mathematical operators."""
-    _singleton = None
-    _singleton_initialized = None
-
-    def __init__(self):
-        if self.__class__._singleton_initialized is None:
-            connectors: _bundling.YamlFileBundle = _bundling.YamlFileBundle(
-                path='data.connectors',
-                resource='tao_analysis_1_2006.yaml')
-            representations: _bundling.YamlFileBundle = _bundling.YamlFileBundle(
-                path='data.representations',
-                resource='tao_analysis_1_2006.yaml')
-            mappings: _bundling.YamlFileBundle = _bundling.YamlFileBundle(
-                path='data.mappings',
-                resource='tao_analysis_1_2006.yaml')
-            bundles = (connectors, representations, mappings,)
-            super().__init__(bundles=bundles)
-            self.__class__._singleton_initialized = True
-            _util.get_logger().debug(
-                f'Tao Analysis 1 (2006) singleton ({id(self)}) initialized.')
-
-    def __new__(cls, *args, **kwargs):
-        if cls._singleton is None:
-            cls._singleton = super(TaoAnalysis12006, cls).__new__(cls)
-        return cls._singleton
-
-    @property
-    def successor(self) -> _formal_language.Connector:
-        return self.connectors.get_from_uuid('successor')
-
-    @property
-    def zero(self) -> _formal_language.Connector:
-        return self.connectors.get_from_uuid('zero')
diff --git a/src/punctilious/data/mappings/tao_analysis_1_2006.yaml b/src/punctilious/data/mappings/tao_analysis_1_2006.yaml
index 33a4d091..169d7eb2 100644
--- a/src/punctilious/data/mappings/tao_analysis_1_2006.yaml
+++ b/src/punctilious/data/mappings/tao_analysis_1_2006.yaml
@@ -4,11 +4,11 @@ description:
   en: Maps the connectors to their representations, according to (Tao, 2006).
 connectors:
   - uid: { slug: successor, uuid: f85163bf-381d-41fa-bdbb-70cd28bb826b }
-    connector_representation: { slug: zero, uuid: 328cbbbf-7331-44b3-88c3-5d7ea912a213 }
-    formula_representation: { slug: prefix_formula, uuid: ca64ae2f-f8a7-4a87-a99d-57d86a8ba0ad }
+    connector_representation: { uid: { slug: successor, uuid: 41c2d319-bf0c-4442-9af6-a6db82ad1f80 } }
+    formula_representation: { uid: { slug: postfix_formula, uuid: af99c47e-c6b8-43e0-a8f4-6331ba79e8fd } }
   - uid: { slug: zero, uuid: 85927ea1-566e-4349-bab9-9845ba3a4b93 }
-    connector_representation: { slug: successor, uuid: 41c2d319-bf0c-4442-9af6-a6db82ad1f80 }
-    formula_representation: { slug: atomic_formula, uuid: f6bd05d7-ee5b-4480-9d59-ea9fa3a13516 }
+    connector_representation: { uid: { slug: zero, uuid: 328cbbbf-7331-44b3-88c3-5d7ea912a213 } }
+    formula_representation: { uid: { slug: atomic_formula, uuid: f6bd05d7-ee5b-4480-9d59-ea9fa3a13516 } }
 bibliography:
   - slug: tao_2006
     citation: Tao, 2006
diff --git a/src/punctilious/data/representations/tao_analysis_1_2006.yaml b/src/punctilious/data/representations/tao_analysis_1_2006.yaml
index 95e766cd..09823dd8 100644
--- a/src/punctilious/data/representations/tao_analysis_1_2006.yaml
+++ b/src/punctilious/data/representations/tao_analysis_1_2006.yaml
@@ -1,15 +1,15 @@
 schema: http://punctilious.org/data/schemas/punctilious_package_schema_1.yaml
 uid: { slug: tao_analysis_1_2006_representations, uuid: 4bb42d13-1e72-4192-bf40-efeeee858705 }
 representations:
-  - uid: { slug: zero, uuid: 328cbbbf-7331-44b3-88c3-5d7ea912a213 }
+  - uid: { slug: successor, uuid: 41c2d319-bf0c-4442-9af6-a6db82ad1f80 }
     renderers:
       - implementation: string_constant
-        string_constant: '0'
+        string_constant: '++'
         tags: { technical_language: unicode_basic, connector_representation: symbol }
-  - uid: { slug: successor, uuid: 41c2d319-bf0c-4442-9af6-a6db82ad1f80 }
+  - uid: { slug: zero, uuid: 328cbbbf-7331-44b3-88c3-5d7ea912a213 }
     renderers:
       - implementation: string_constant
-        string_constant: '++'
+        string_constant: '0'
         tags: { technical_language: unicode_basic, connector_representation: symbol }
 bibliography:
   - slug: tao_2006
diff --git a/src/punctilious/tao_analysis_1_2006.py b/src/punctilious/tao_analysis_1_2006.py
new file mode 100644
index 00000000..0f2eb054
--- /dev/null
+++ b/src/punctilious/tao_analysis_1_2006.py
@@ -0,0 +1,16 @@
+import _util
+import _formal_language
+import _bundling
+
+yaml_file_1 = _bundling.YamlFileBundle(path='data.connectors',
+                                       resource='tao_analysis_1_2006.yaml')
+yaml_file_2 = _bundling.YamlFileBundle(path='data.representations',
+                                       resource='tao_analysis_1_2006.yaml')
+yaml_file_3 = _bundling.YamlFileBundle(path='data.mappings',
+                                       resource='tao_analysis_1_2006.yaml')
+
+successor: _formal_language.Connector = yaml_file_1.connectors.get_from_uuid(
+    'f85163bf-381d-41fa-bdbb-70cd28bb826b', raise_error_if_not_found=True)
+
+zero: _formal_language.Connector = yaml_file_1.connectors.get_from_uuid(
+    '85927ea1-566e-4349-bab9-9845ba3a4b93', raise_error_if_not_found=True)