Merge branch 'master' of github.com:highperformancecoder/minsky

highperformancecoder · Jan 16, 2024 · 959b4f0 · 959b4f0
2 parents fa93759 + d0e3b75
commit 959b4f0
Show file tree

Hide file tree

Showing 54 changed files with 820 additions and 698 deletions.
diff --git a/RESTService/typescriptAPI.cc b/RESTService/typescriptAPI.cc
@@ -47,6 +47,7 @@
 #include "polyRESTProcessBase.tcd"
 #include "port.h"
 #include "port.tcd"
+#include "publication.tcd"
 #include "pubTab.tcd"
 #include "ravelState.tcd"
 #include "renderNativeWindow.tcd"

diff --git a/ecolab b/ecolab
diff --git a/examples/1Free.mky b/examples/1Free.mky
@@ -1,6 +1,6 @@
  <Minsky xmlns="http://minsky.sf.net/minsky">
   <schemaVersion>3</schemaVersion>
-  <minskyVersion>3.2.0-alpha.33</minskyVersion>
+  <minskyVersion>3.2.0-beta.2</minskyVersion>
   <wires>
    <Wire>
     <id>64</id>
@@ -9,11 +9,11 @@
     <coords>
      <float>106.48</float>
      <float>298.831</float>
-     <float>80.185</float>
-     <float>331.472</float>
-     <float>40.2885</float>
-     <float>126.553</float>
-     <float>26.6527</float>
+     <float>80.2514</float>
+     <float>331.39</float>
+     <float>40.4557</float>
+     <float>126.988</float>
+     <float>29.28</float>
      <float>24.26</float>
     </coords>
    </Wire>
@@ -24,12 +24,12 @@
     <coords>
      <float>151.48</float>
      <float>298.831</float>
-     <float>87.4496</float>
-     <float>366.277</float>
-     <float>38.787</float>
-     <float>168.208</float>
-     <float>7.66182</float>
-     <float>53.3509</float>
+     <float>88.0349</float>
+     <float>365.66</float>
+     <float>39.8172</float>
+     <float>169.402</float>
+     <float>11.28</float>
+     <float>54.26</float>
     </coords>
    </Wire>
    <Wire>
@@ -39,10 +39,10 @@
     <coords>
      <float>189.48</float>
      <float>299.831</float>
-     <float>43.2256</float>
-     <float>426.106</float>
-     <float>9.67091</float>
-     <float>82.4418</float>
+     <float>45.142</float>
+     <float>424.451</float>
+     <float>13.28</float>
+     <float>84.26</float>
     </coords>
    </Wire>
    <Wire>
@@ -152,7 +152,7 @@
     <id>12</id>
     <type>Variable:stock</type>
     <x>103</x>
-    <y>153.578</y>
+    <y>152.76</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -176,8 +176,8 @@
     <name>:Loans</name>
     <id>14</id>
     <type>Variable:stock</type>
-    <x>132.091</x>
-    <y>156.305</y>
+    <x>133</x>
+    <y>155.76</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -201,8 +201,8 @@
     <name>:Firms</name>
     <id>16</id>
     <type>Variable:stock</type>
-    <x>161.182</x>
-    <y>155.396</y>
+    <x>163</x>
+    <y>154.76</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -226,8 +226,8 @@
     <name>:Safe</name>
     <id>18</id>
     <type>Variable:stock</type>
-    <x>190.273</x>
-    <y>149.942</y>
+    <x>193</x>
+    <y>149.76</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -251,7 +251,7 @@
     <name>:Loan</name>
     <id>20</id>
     <type>Variable:flow</type>
-    <x>56.5527</x>
+    <x>56.28</x>
     <y>24.26</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
@@ -277,8 +277,8 @@
     <name>:IntLoan</name>
     <id>23</id>
     <type>Variable:flow</type>
-    <x>47.4618</x>
-    <y>53.3509</y>
+    <x>47.28</x>
+    <y>54.26</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -303,8 +303,8 @@
     <name>:FirmInt</name>
     <id>26</id>
     <type>Variable:flow</type>
-    <x>48.3709</x>
-    <y>82.4418</y>
+    <x>48.28</x>
+    <y>84.26</y>
     <itemTabX>0</itemTabX>
     <itemTabY>0</itemTabY>
     <scaleFactor>1</scaleFactor>
@@ -455,7 +455,6 @@
     <logx>false</logx>
     <logy>false</logy>
     <ypercent>false</ypercent>
-    <plotTabDisplay>true</plotTabDisplay>
     <grid>true</grid>
     <subgrid>false</subgrid>
     <plotType>line</plotType>
@@ -812,4 +811,6 @@
   </phillipsDiagram>
   <publicationTabs>
   </publicationTabs>
+  <publicationItems>
+  </publicationItems>
  </Minsky>