move to lib

cmd/primeOmega.go

@@ -20,57 +20,14 @@ import (
 	"fmt"
 
 	"github.com/spf13/cobra"
+	"scm.dairydemon.net/filifa/mathtools/internal/lib"
 )
 
 var primeOmegaN uint
 var primeOmegaMul bool
 
-func primeOmegaUpdateMultiples(sieve []uint, p uint, n uint, multiplicity bool) {
-	for q := p; ; q *= p {
-		// omega(a*b) = omega(a) + omega(b) if gcd(a,b) = 1
-		for i := 2 * q; i < n; i += q {
-			if i%(p*q) != 0 {
-				sieve[i] += sieve[q]
-			}
-		}
-
-		if p*q >= n {
-			break
-		}
-
-		if multiplicity {
-			sieve[p*q] = 1 + sieve[q]
-		}
-	}
-}
-
-func primeOmegaSieve(n uint) chan uint {
-	sieve := make([]uint, n)
-	for i := uint(0); i < n; i++ {
-		sieve[i] = 0
-	}
-
-	ch := make(chan uint)
-	go func() {
-		for i := uint(0); i < n; i++ {
-			if i == 0 || i == 1 || sieve[i] != 0 {
-				ch <- sieve[i]
-				continue
-			}
-
-			sieve[i] = 1
-			primeOmegaUpdateMultiples(sieve, i, n, primeOmegaMul)
-			ch <- sieve[i]
-		}
-
-		close(ch)
-	}()
-
-	return ch
-}
-
 func primeOmega(cmd *cobra.Command, args []string) {
-	ch := primeOmegaSieve(primeOmegaN)
+	ch := lib.PrimeOmegaSieve(primeOmegaN, primeOmegaMul)
 	for i := 0; ; i++ {
 		v, ok := <-ch
 		if !ok {