diff options
| -rw-r--r-- | factor_info.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/factor_info.go b/factor_info.go index bcfc3b1..767a9bf 100644 --- a/factor_info.go +++ b/factor_info.go @@ -100,7 +100,10 @@ func getFactorInfo(a args) *factorInfo { func (fi *factorInfo) writeTo(w io.Writer) { fmt.Fprintln(w, fi.Radix, "=", fi.PrimeFactorization) - fmt.Fprintf(w, "Factors: %v (Score: %.4f)\n", fi.Factors, fi.Score) + fmt.Fprintln(w, "Factors:", fi.Factors) + fmt.Fprintf(w, "Factor Utility Score: %.4f\n", fi.Score) + fmt.Fprintf(w, "Regular Utility Score: %.4f\n", + float64(fi.Radix) / float64(fi.Totient)) fmt.Fprintln(w, "2345 Rank:", fi.BasicRank) if fi.TotativeDigits != nil { fmt.Fprintf(w, "Totative Digits: %v (%.3f%%)\n", @@ -126,8 +129,8 @@ func (fi *factorInfo) writeTo(w io.Writer) { } func (fi *factorInfo) writeToCompact(w io.Writer) { - fmt.Fprintf(w, "%d = %s | σ(r)/r: %.2f | φ(r)/r: %.3f\n", - fi.Radix, fi.PrimeFactorization, fi.Score, fi.TotativeRatio) + fmt.Fprintf(w, "%d = %s | σ(r)/r: %.2f | r/φ(r): %.2f\n", + fi.Radix, fi.PrimeFactorization, fi.Score, 1 / fi.TotativeRatio) fmt.Fprintf(w, "%s | ", typeAbbrev(fi.Type)) if fi.MTC != nil { fmt.Fprintf(w, "MTC: %d | ", *fi.MTC) |