Replace 'primeness' with 'primality'

Also make the results headin grammatically correct, because shorthand isn't used anywhere else in the output. Signed-off-by: Shay Gordon <[email protected]>
moebius-rex · Jun 3, 2021 · c5ef3d2 · c5ef3d2
1 parent 9727b11
commit c5ef3d2
Show file tree

Hide file tree

Showing 30 changed files with 43 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,7 @@ Once you've completed the installation, you can run the implementations. To run
 ```bash
 % prime
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 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 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 4 microseconds
 [snip]
@@ -89,7 +89,7 @@ And finally, to run a given example of a given language:
 Makefile  app/      app2/     sieve/    sievex/
 % make app2/
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 2 3 5 7 11 13 17 19 23 29 .. 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 11 microseconds
 ```

diff --git a/docker/DOCKER.md b/docker/DOCKER.md
@@ -101,7 +101,7 @@ The `docker compose exec` command runs a command in a named container. For examp
 % docker compose exec alpine make
 [snip]
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 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 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1,000 integers in 98 microseconds
 [snip]
@@ -119,19 +119,19 @@ Makefile   app.py     app2.py    app3.py    csieve.py  sieve.py
 [root@0a0689fe1cf4:/prime/src/main/python]# make
 python/app
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 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 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 100 microseconds
 
 python/app2
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 2 3 5 7 11 13 17 19 23 29 .. 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 188 microseconds
 
 python/app3
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 2 3 5 7 11 13 17 19 23 29 .. 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 17 microseconds
 

diff --git a/setup/INSTALL.md b/setup/INSTALL.md
@@ -116,7 +116,7 @@ make --no-print-directory --directory src/main
 make --no-print-directory --directory c
 make --no-print-directory --directory sieve
 Sieve of Eratosthenes: Find all prime numbers in a given range
-Prime numbers in range 0-1000 inclusive:
+Prime numbers in the range 0-1000 inclusive:
 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 101 103 107 109 113 127 131 137 139 149 151 157 163 167 173 179 181 191 193 197 199 211 223 227 229 233 239 241 251 257 263 269 271 277 281 283 293 307 311 313 317 331 337 347 349 353 359 367 373 379 383 389 397 401 409 419 421 431 433 439 443 449 457 461 463 467 479 487 491 499 503 509 521 523 541 547 557 563 569 571 577 587 593 599 601 607 613 617 619 631 641 643 647 653 659 661 673 677 683 691 701 709 719 727 733 739 743 751 757 761 769 773 787 797 809 811 821 823 827 829 839 853 857 859 863 877 881 883 887 907 911 919 929 937 941 947 953 967 971 977 983 991 997 
 Found 168 prime(s) in 1000 integers in 4 microseconds
 [snip]

diff --git a/src/main/c/app/app.c b/src/main/c/app/app.c
@@ -25,7 +25,7 @@
  */
 static int read_range() {
   char buf[100];
-  printf("Enter highest integer to test for primeness: ");
+  printf("Enter highest integer to test for primality: ");
   fgets(buf, sizeof(buf), stdin);
   return strtol(buf, (char**) NULL, 10);
 }
@@ -43,7 +43,7 @@ static void compute_primes(bool* integers, int range) {
 }
 
 static void print_primes(bool* integers, int range) {
-  printf("Prime numbers in range 0-%d inclusive:\n", range);
+  printf("Prime numbers in the range 0-%d inclusive:\n", range);
   for (int p = 2; p <= range; ++p) {
     if (integers[p]) {
       if (range <= 1000 || range - p <= 1000) {

diff --git a/src/main/c/app2/app.c b/src/main/c/app2/app.c
@@ -21,7 +21,7 @@
 static int read_range(int range) {
   if (range == 0) {
     char buf[100];
-    printf("Enter highest integer to test for primeness: ");
+    printf("Enter highest integer to test for primality: ");
     fgets(buf, sizeof(buf), stdin);
     range = strtol(buf, (char**) NULL, 10);
   }

diff --git a/src/main/c/sieve/app.c b/src/main/c/sieve/app.c
@@ -21,7 +21,7 @@
 int read_range(int range) {
   if (range == 0) {
     char buf[100];
-    printf("Enter highest integer to test for primeness: ");
+    printf("Enter highest integer to test for primality: ");
     fgets(buf, sizeof(buf), stdin);
     range = strtol(buf, (char**) NULL, 10);
   }

diff --git a/src/main/c/sieve/csieve.c b/src/main/c/sieve/csieve.c
@@ -121,7 +121,7 @@ void csieve_compute_primes(csieve* self) {
 }
 
 void csieve_print_primes(const csieve* self) {
-  printf("Prime numbers in range 0-%d inclusive:\n", self->range);
+  printf("Prime numbers in the range 0-%d inclusive:\n", self->range);
   int half = self->count / 2;
   for (int n = 0; n < self->count; ++n) {
     int p = self->primes[n];

diff --git a/src/main/c/sievex/app.c b/src/main/c/sievex/app.c
@@ -21,7 +21,7 @@
 int read_range(int range) {
   if (range == 0) {
     char buf[100];
-    printf("Enter highest integer to test for primeness: ");
+    printf("Enter highest integer to test for primality: ");
     fgets(buf, sizeof(buf), stdin);
     range = strtol(buf, (char**) NULL, 10);
   }

diff --git a/src/main/cpp/app/app.cpp b/src/main/cpp/app/app.cpp
@@ -59,7 +59,7 @@ void App::compute_primes() {
 }
 
 void App::print_primes() {
-  std::cout << "Prime numbers in range 0-" << this->range << " inclusive:" << std::endl;
+  std::cout << "Prime numbers in the range 0-" << this->range << " inclusive:" << std::endl;
   for (int p = 0; p <= this->range; ++p) {
     if (this->primes[p]) {
       if (this->range <= 1000 || this->range - p <= 1000) {

diff --git a/src/main/cpp/app/main.cpp b/src/main/cpp/app/main.cpp
@@ -21,7 +21,7 @@ using namespace std;
 
 int read_range(int range) {
   if (range == 0) {
-    std::cout << "Enter highest integer to test for primeness: ";
+    std::cout << "Enter highest integer to test for primality: ";
     std::cin >> range;
   }
   return range;

diff --git a/src/main/cpp/app2/app.cpp b/src/main/cpp/app2/app.cpp
@@ -21,7 +21,7 @@ using namespace std;
 
 int read_range(int range) {
   if (range == 0) {
-    std::cout << "Enter highest integer to test for primeness: ";
+    std::cout << "Enter highest integer to test for primality: ";
     std::cin >> range;
   }
   return range;

diff --git a/src/main/cpp/app2/sieve.cpp b/src/main/cpp/app2/sieve.cpp
@@ -79,7 +79,8 @@ void Sieve::compute_primes() {
 }
 
 void Sieve::print_primes() const {
-  std::cout << "Prime numbers in range 0-" << this->range << " inclusive:" << std::endl;
+  std::cout << "Prime numbers in the range 0-" << this->range
+            << " inclusive:" << std::endl;
   int half = this->primes.size() / 2;
   for (size_t n = 0; n < this->primes.size(); n++) {
     int p = this->primes.at(n);

diff --git a/src/main/cpp/app3/app.cpp b/src/main/cpp/app3/app.cpp
@@ -21,7 +21,7 @@ using namespace std;
 
 static int read_range(int range) {
   if (range == 0) {
-    std::cout << "Enter highest integer to test for primeness: ";
+    std::cout << "Enter highest integer to test for primality: ";
     std::cin >> range;
   }
   return range;

diff --git a/src/main/cpp/app4/app.cpp b/src/main/cpp/app4/app.cpp
@@ -21,7 +21,7 @@ using namespace std;
 
 static int read_range(int range) {
   if (range == 0) {
-    std::cout << "Enter highest integer to test for primeness: ";
+    std::cout << "Enter highest integer to test for primality: ";
     std::cin >> range;
   }
   return range;

diff --git a/src/main/cpp/app5/app.cpp b/src/main/cpp/app5/app.cpp
@@ -24,7 +24,7 @@ using namespace shay::gordon;
 
 static int read_range(int range) {
   if (range == 0) {
-    cout << "Enter highest integer to test for primeness: "; cin >> range;
+    cout << "Enter highest integer to test for primality: "; cin >> range;
   }
   return range;
 }

diff --git a/src/main/cpp/app5/sieve.cpp b/src/main/cpp/app5/sieve.cpp
@@ -97,7 +97,7 @@ void sieve::impl::compute() {
 }
 
 void sieve::impl::print() const {
-  cout << "Prime numbers in range 0-" << m_range << " inclusive:" << endl;
+  cout << "Prime numbers in the range 0-" << m_range << " inclusive:" << endl;
   int half = m_primes.size() / 2;
   for (size_t n = 0; n < m_primes.size(); ++n) {
     int p = m_primes[n];

diff --git a/src/main/go/app/app.go b/src/main/go/app/app.go
@@ -38,7 +38,7 @@ func read_range() (r int64, err error) {
 		return r, nil
 	}
 
-	fmt.Print("Enter highest integer to test for primeness: ")
+	fmt.Print("Enter highest integer to test for primality: ")
 	if _, err := fmt.Scanf("%d", &r); err != nil {
 		return 0, fmt.Errorf("not an integer")
 	}
@@ -67,7 +67,7 @@ func compute_primes(r int) []bool {
 
 func print_primes(primes []bool) {
 	n := len(primes)
-	fmt.Printf("Prime numbers in range 0-%d inclusive:\n", n-1)
+	fmt.Printf("Prime numbers in the range 0-%d inclusive:\n", n-1)
 	for p := 2; p < n; p++ {
 		if primes[p] {
 			if n <= 1000 || n-p <= 1000 {

diff --git a/src/main/go/app2/app.go b/src/main/go/app2/app.go
@@ -36,7 +36,7 @@ func readRange() (r int64, err error) {
 		return r, nil
 	}
 
-	fmt.Print("Enter highest integer to test for primeness: ")
+	fmt.Print("Enter highest integer to test for primality: ")
 	if _, err := fmt.Scanf("%d", &r); err != nil {
 		return 0, fmt.Errorf("not an integer")
 	}

diff --git a/src/main/go/app3/app.go b/src/main/go/app3/app.go
@@ -39,7 +39,7 @@ func read_range() (r int64, err error) {
 	}
 
 	// read range from user input
-	fmt.Print("Enter highest integer to test for primeness: ")
+	fmt.Print("Enter highest integer to test for primality: ")
 	if _, err := fmt.Scanf("%d", &r); err != nil {
 		return 0, fmt.Errorf("not an integer")
 	}

diff --git a/src/main/go/sieve/sieve.go b/src/main/go/sieve/sieve.go
@@ -36,7 +36,7 @@ type ISieve interface {
 	Integers() []bool       // [0 < n < range] == true => prime number
 	Primes() []int          // [0 < m < count] => a prime number
 	PrimeMap() map[int]bool // map[m] == true => a prime number
-	Range() int             // range of integers tested for primeness
+	Range() int             // range of integers tested for primality
 	Count() int             // count of primes in range tested
 	Elapsed() time.Duration // time taken to compute primes in range
 }
@@ -109,7 +109,7 @@ func (s *Sieve) ComputePrimes() *Sieve {
 
 // Prints any previously calculated prime numbers.
 func (s *Sieve) PrintPrimes() {
-	fmt.Printf("Prime numbers in range 0-%d inclusive:\n", s.inrange)
+	fmt.Printf("Prime numbers in the range 0-%d inclusive:\n", s.inrange)
 	half := int(s.count / 2)
 	for i := 0; i < s.count; i++ {
 		j := s.primes[i]
@@ -154,7 +154,7 @@ func (s *Sieve) PrimeMap() (pm map[int]bool) {
 }
 
 // Returns the range of integers that will be or have been checked for
-// primeness. This is the integer value provided to the NewSieve() method
+// primality. This is the integer value provided to the NewSieve() method
 // and it is the size of the boolean array returned by Integers() less one,
 // i.e., sieve.Range() = len(sieve.Integers()) - 1.
 func (s *Sieve) Range() int {

diff --git a/src/main/java/com/shaygordon/primes/App.java b/src/main/java/com/shaygordon/primes/App.java
@@ -27,7 +27,7 @@
 public class App {
   private static int getRange() {
     int range = 0;
-    System.out.print("Enter highest integer to test for primeness: ");
+    System.out.print("Enter highest integer to test for primality: ");
     try (Scanner scanner = new Scanner(new InputStreamReader(System.in))) {
       range = scanner.nextInt();
     } catch (InputMismatchException ime) {
@@ -65,7 +65,7 @@ private static int getCount(boolean[] prime) {
 
   private static void printPrimes(boolean[] prime) {
     int range = prime.length - 1;
-    System.out.println(String.format("Prime numbers in range 0-%d:", range));
+    System.out.println(String.format("Prime numbers in the range 0-%d:", range));
     for (int p = 0; p <= range; p++) {
       if (prime[p]) {
         if (range <= 1000 || range - p <= 1000) {

diff --git a/src/main/java/com/shaygordon/primes/App2.java b/src/main/java/com/shaygordon/primes/App2.java
@@ -22,7 +22,7 @@
 public class App2 {
   private static int readRange(int range) {
     if (range == 0) {
-      System.out.print("Enter highest integer to test for primeness: ");
+      System.out.print("Enter highest integer to test for primality: ");
       try (Scanner scanner = new Scanner(new InputStreamReader(System.in))) {
         range = scanner.nextInt();
       } catch (InputMismatchException ime) {

diff --git a/src/main/java/com/shaygordon/primes/Sieve.java b/src/main/java/com/shaygordon/primes/Sieve.java
@@ -77,7 +77,8 @@ public void computePrimes() {
   }
 
   public void printPrimes() {
-    System.out.println(String.format("Prime numbers in range 0-%d:", range));
+    System.out.println(
+          String.format("Prime numbers in the range 0-%d:", range));
     StringBuilder sb = new StringBuilder();
     int half = this.primes.size() / 2;
     for (int n = 0; n < this.primes.size(); n++) {

diff --git a/src/main/js/app.js b/src/main/js/app.js
@@ -50,7 +50,7 @@ function computePrimes(integers) {
 }
 
 function printPrimes(integers) {
-  console.log("Prime numbers in range 0-" + (integers.length - 1)
+  console.log("Prime numbers in the range 0-" + (integers.length - 1)
       + " inclusive:");
   integers.forEach((val, p) => {
     if (val) {
@@ -81,7 +81,7 @@ if (process.argv.length > 2) {
   main(parseInt(process.argv[2]));
 } else {
   let rl = readline.createInterface(process.stdin, process.stdout);
-  rl.question("Enter highest integer to test for primeness: ", range => {
+  rl.question("Enter highest integer to test for primality: ", range => {
     main(parseInt(range));
     rl.close();
   });

diff --git a/src/main/js/app2.js b/src/main/js/app2.js
@@ -32,7 +32,7 @@ console.log("Sieve of Eratosthenes: Find all prime numbers in a given range");
 if (process.argv.length > 2) {
   main(process.argv[2]);
 } else {
-  process.stdout.write("Enter highest integer to test for primeness: ");
+  process.stdout.write("Enter highest integer to test for primality: ");
   process.stdin.on('data', data => {
     process.stdin.pause();
     main(data);

diff --git a/src/main/js/sieve.js b/src/main/js/sieve.js
@@ -74,7 +74,7 @@ class Sieve {
   }
 
   printPrimes() {
-    console.log("Prime numbers in range 0-" + this.range + " inclusive:");
+    console.log("Prime numbers in the range 0-" + this.range + " inclusive:");
     const half = Math.floor(this.count / 2);
     this.#primes.forEach((p, n) => {
       if (half > MAX_HALF) {

diff --git a/src/main/python/app.py b/src/main/python/app.py
@@ -24,7 +24,7 @@
 """
 
 def get_range():
-  return int(input("Enter highest integer to test for primeness: "))
+  return int(input("Enter highest integer to test for primality: "))
 
 def compute_primes(n):
   prime = [True] * (n + 1)
@@ -39,7 +39,7 @@ def compute_primes(n):
 
 def print_primes(prime):
   n = len(prime)
-  print(f"Prime numbers in range 0-{n - 1:d} inclusive:")
+  print(f"Prime numbers in the range 0-{n - 1:d} inclusive:")
   for p in range(n):
     if prime[p]:
       if n <= 1000 or n - p <= 1000:

diff --git a/src/main/python/app2.py b/src/main/python/app2.py
@@ -21,7 +21,7 @@
 
 def read_range(range):
   if (range == 0):
-    range = int(input("Enter highest integer to test for primeness: "))
+    range = int(input("Enter highest integer to test for primality: "))
   return range
 
 def main():

diff --git a/src/main/python/app3.py b/src/main/python/app3.py
@@ -20,7 +20,7 @@
 
 def read_range(range):
 	if (range == 0):
-		range = int(input("Enter highest integer to test for primeness: "))
+		range = int(input("Enter highest integer to test for primality: "))
 	return range
 
 def main():

diff --git a/src/main/python/sieve.py b/src/main/python/sieve.py
@@ -62,7 +62,7 @@ def compute_primes(self):
     return self
 
   def print_primes(self):
-    print(f"Prime numbers in range 0-{self.range:d} inclusive:")
+    print(f"Prime numbers in the range 0-{self.range:d} inclusive:")
     half = int(self.get_count() / 2)
     for n, p in enumerate(self.primes):
       if half > Sieve.MAX_HALF: