# HG changeset patch
# User Christian Urban <christian.urban@kcl.ac.uk>
# Date 1614329238 0
# Node ID 284ac979f2890de335954b0a1fd260b502ca5d4c
# Parent  bde572a541125499c363988740bdef4998f38de0
updated while tests

diff -r bde572a54112 -r 284ac979f289 progs/while-tests/and.while
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/progs/while-tests/and.while	Fri Feb 26 08:47:18 2021 +0000
@@ -0,0 +1,6 @@
+n := 0;
+if (n == 0) && (n == 1) then {
+    write "yes"
+} else {
+    write "no"
+}
\ No newline at end of file
diff -r bde572a54112 -r 284ac979f289 progs/while-tests/andor.while
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/progs/while-tests/andor.while	Fri Feb 26 08:47:18 2021 +0000
@@ -0,0 +1,6 @@
+n := 0;
+if ((n == 0) || (n == 1)) && ((n == 2) || (n <= 0)) then {
+    write "yes"
+} else {
+    write "no"
+}
\ No newline at end of file
diff -r bde572a54112 -r 284ac979f289 progs/while-tests/factors.while
--- a/progs/while-tests/factors.while	Thu Feb 04 10:19:48 2021 +0000
+++ b/progs/while-tests/factors.while	Fri Feb 26 08:47:18 2021 +0000
@@ -1,14 +1,11 @@
 // Find all factors of a given input number
-// by J.R. Cordy August 2005
+
 
 write "Input n please";
 read n;
 write "The factors of n are";
 f := 2;
-while n != 1 do {
-    while (n / f) * f == n do {
-        write f;
-        n := n / f
-    };
-    f := f + 1
+while (f < n / 2 + 1) do {
+  if ((n / f) * f == n) then  { write(f) } else { skip };
+  f := f + 1
 }
\ No newline at end of file
diff -r bde572a54112 -r 284ac979f289 progs/while-tests/or.while
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/progs/while-tests/or.while	Fri Feb 26 08:47:18 2021 +0000
@@ -0,0 +1,6 @@
+n := 0;
+if (n == 0) || (n == 1) then {
+    write "yes"
+} else {
+    write "no"
+}
\ No newline at end of file