Commit: 1243c3ba5627ec22a957a30299c1f1e56b1abb86 - DocIdeas (hg)

Commit MetaInfo

• Révision: 1243c3ba5627ec22a957a30299c1f1e56b1abb86 (tree)
• l'heure: 2024-04-12 06:25:37
• Auteur: Albert Mietus < albert AT mietus DOT nl >
• Commiter: Albert Mietus < albert AT mietus DOT nl >

Message de Log

Aligned 'TheSieve blog code' with (manual) RPy code [See: Sieve_in_rPython/basic-1]

Change Summary

• modified: CCastle/4.Blog/sieve-castle.irst
• modified: CCastle/4.Blog/sieve-main.irst
• modified: CCastle/DocParts/Design/50.notes/240408-aigr-machinery.rst

Modification

diff -r ccf9a61a3c92 -r 1243c3ba5627 CCastle/4.Blog/sieve-castle.irst
--- a/CCastle/4.Blog/sieve-castle.irst	Tue Apr 09 22:12:11 2024 +0200
+++ b/CCastle/4.Blog/sieve-castle.irst	Thu Apr 11 23:25:37 2024 +0200
@@ -8,6 +8,12 @@
       implement Generator {
         int maxValue;
 
+      init()
+      {
+        .maxValue = -1;
+      }
+
+
       StartSieve.newMax(max) on .controll
       {
         .maxValue := max;
@@ -21,6 +27,7 @@
         i:=0;
         while (i < .maxValue) {
           .outlet.input(i);
+          i +=1;
         }
       }
 
@@ -53,6 +60,11 @@
       implement Finder {
         int count;
 
+      init()
+      {
+        .count = 0;
+      }
+
       SimpleSieve.input(foundPrime) on .newPrime
       {
         report(foundPrime)

diff -r ccf9a61a3c92 -r 1243c3ba5627 CCastle/4.Blog/sieve-main.irst
--- a/CCastle/4.Blog/sieve-main.irst	Tue Apr 09 22:12:11 2024 +0200
+++ b/CCastle/4.Blog/sieve-main.irst	Thu Apr 11 23:25:37 2024 +0200
@@ -10,13 +10,11 @@
         sub generator;
         sub finder;
         alias lastSieve;         // The list of Sieve's grow dynamically!; keep track of the last one
-      ...
 
 
    .. code-tab:: ReasonML init()
 
-      init()
-      {
+      init() {
         super.init();
 
         .generator := Generator();
@@ -28,38 +26,53 @@
       }
 
 
-   .. code-tab:: ReasonML try()
+   .. code-tab:: ReasonML finder.found
 
-      // We have extend the sieve-list (and reconnect) on a newly found prime ..
-      SimpleSieve.try(newPrime) on .finder.found
+      // We have extend the sieve-list (and reconnect), for every newly found prime.
+      SimpleSieve.input(newPrime) on .finder.found
       {
         alias s;
 
         // Extent the sieve-list ...
         s:= Sieve(newPrime);
         insert_sieve(s);
+        verifyCorrectPrime(newPrime);
       }
 
+   .. code-tab:: ReasonML local functions
 
-      insert_sieve(alias:s)
-      {
-        // Connect s to the lastSieve, or the Generator
-        if (.lastSieve == Ground) {              // .lastSieve == Ground, so not connected, so we have the first Sieve to connect to .generator
+      insert_sieve(alias:s) {
+        // Connect the input of S to the lastSieve, or to the Generator
+        if (.lastSieve == Ground) {            // .lastSieve == Ground, so not connected, so we have the first Sieve to connect to .generator
            .generator.outlet = s.try;
          } else {
            .lastSieve.coprime = s.try;
         }
 
-        // And to the Finder, that is self
-        s.coprime = .finder.newPrime;
+        s.coprime = .finder.newPrime;          // Connect to output of S to the finder
+        .lastSieve := s                        // a new lastSieve
       }
 
+      verifyCorrectPrime(int:gotPrime) {
+           local int count:=0; ///Semantics: instance var, with function-local scope
+           cons PRIMES:= [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97];
+
+           if count >= len(PRIMES) {
+              print("Warning: Can only check {len(PRIMES)} primes, {gotPrime) is not verified")
+              return
+           }
+
+           expect := PRIMES[count]
+           if expect != gotPrime {
+              printf("ERROR: Prime no {count} should be {expect}, but got {gotPrime}”)
+
+           count += 1;
+
+
    .. code-tab:: ReasonML  powerOn()
 
-      powerOn() // this kick-starts “every main”
+      powerOn(int:max=10) // this kick-starts “every main”
       {
-        int max := 10;
-
         .generator.runTo(max);
       }
 

diff -r ccf9a61a3c92 -r 1243c3ba5627 CCastle/DocParts/Design/50.notes/240408-aigr-machinery.rst
--- a/CCastle/DocParts/Design/50.notes/240408-aigr-machinery.rst	Tue Apr 09 22:12:11 2024 +0200
+++ b/CCastle/DocParts/Design/50.notes/240408-aigr-machinery.rst	Thu Apr 11 23:25:37 2024 +0200
@@ -46,9 +46,8 @@
    send_proto -> DispatchTable
 
    class connection {
-     + out: <outport, component>
-     + in:    <inport,  component>
-     # protocol <indirect>
+     + outport: <outport, component>
+     + inport:    <inport,  component>
    }
    note top #aqua
      This is the result of
@@ -89,7 +88,6 @@
 
    Event "1".. "*" EventHandler
    Event .> Protocol: > part of
-   Protocol ... connection
 
    @enduml