Merge branch 'master' into modified

1 files changed, 26 insertions, 11 deletions

diff --git a/misc/examples/triples.c b/misc/examples/triples.c
index 4783d603..520bf012 100644
--- a/misc/examples/triples.c
+++ b/misc/examples/triples.c
@@ -4,12 +4,12 @@
 #include <stdio.h>
 
 void triples_vanilla(int n) {
-    for (int i = 1, c = 1;; ++c) {
+    for (int c = 5; n; ++c) {
         for (int a = 1; a < c; ++a) {
-            for (int b = a; b < c; ++b) {
-                if (a*a + b*b == c*c) {
-                    printf("{%d, %d, %d},\n", a, b, c);
-                    if (++i > n) goto done;
+            for (int b = a + 1; b < c; ++b) {
+                if ((int64_t)a*a + (int64_t)b*b == (int64_t)c*c) {
+                    printf("{%d, %d, %d}\n", a, b, c);
+                    if (--n == 0) goto done;
                 }
             }
         }
@@ -25,20 +25,29 @@ struct triples {
 
 bool triples_next(struct triples* I) {
     cco_begin(I);
-        for (I->c = 1;; ++I->c) {
+        for (I->c = 5; I->n; ++I->c) {
             for (I->a = 1; I->a < I->c; ++I->a) {
-                for (I->b = I->a; I->b < I->c; ++I->b) {
-                    if (I->a*I->a + I->b*I->b == I->c*I->c) {
-                        if (I->n-- == 0) cco_return;
+                for (I->b = I->a + 1; I->b < I->c; ++I->b) {
+                    if ((int64_t)I->a*I->a + (int64_t)I->b*I->b == (int64_t)I->c*I->c) {
                         cco_yield(true);
+                        if (--I->n == 0) cco_return;
                     }
                 }
             }
         }
         cco_final:
+        puts("done");
     cco_end(false);
 }
 
+int gcd(int a, int b) {
+    while (b) {
+        int t = a % b;
+        a = b;
+        b = t;
+    }
+    return a;
+}
 
 int main()
 {
@@ -47,8 +56,14 @@ int main()
 
     puts("\nCoroutine triples:");
     struct triples t = {INT32_MAX};
+    int n = 0;
+
     while (triples_next(&t)) {
-        if (t.c < 100) printf("{%d, %d, %d},\n", t.a, t.b, t.c);
-        else cco_stop(&t);
+        if (gcd(t.a, t.b) > 1)
+            continue;
+        if (t.c < 100)
+            printf("%d: {%d, %d, %d}\n", ++n, t.a, t.b, t.c);
+        else
+            cco_stop(&t);
     }
 }