pb 072 and cleaning up spaces

clean_uncommited

@@ -1,8 +0,0 @@
-#!/usr/bin/env zsh
-
-[[ $1 != "-f" ]] && { print "Use -f option to delete:" }
-
-for fic in $(git status | tail -n +5| head -n -1 |awk '{print $2}'); do
-print '[?]' $fic
-[[ $1 = "-f" ]] && \rm $fic
-done

hs-euler/.gitignore

@@ -0,0 +1,3 @@
+.stack-work/
+euler072.cabal
+*~

hs-euler/ChangeLog.md

@@ -0,0 +1,3 @@
+# Changelog for euler072
+
+## Unreleased changes

hs-euler/LICENSE

@@ -0,0 +1,30 @@
+Copyright Author name here (c) 2019
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Author name here nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

hs-euler/README.md

@@ -0,0 +1 @@
+# euler072

hs-euler/Setup.hs

@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain

hs-euler/app/Main.hs

@@ -0,0 +1,61 @@
+#!/usr/bin/env stack
+{- stack script
+   --resolver lts-13.24
+   --install-ghc
+   --package arithmoi
+-}
+
+{-
+Consider the fraction, n/d, where n and d are positive integers. If n<d and
+HCF(n,d)=1, it is called a reduced proper fraction.
+
+If we list the set of reduced proper fractions for d ≤ 8 in ascending order of
+size, we get:
+
+1/8, 1/7, 1/6, 1/5, 1/4, 2/7, 1/3, 3/8, 2/5, 3/7, 1/2, 4/7, 3/5, 5/8, 2/3, 5/7, 3/4, 4/5, 5/6, 6/7, 7/8
+
+It can be seen that there are 21 elements in this set.
+
+How many elements would be contained in the set of reduced proper fractions for
+d ≤ 1,000,000?
+-}
+{-# LANGUAGE NoImplicitPrelude #-}
+module Main where
+
+import Protolude
+
+import Math.NumberTheory.Primes
+
+reducedProper :: Integer -> [Integer]
+reducedProper d = do
+  let pf = map fst $ factorise d
+  x <- [1..d]
+  guard (not (any (\p -> x `rem` p == 0) pf))
+  return x
+
+-- Naive solution, took ages
+nbFractions :: Integer -> Int
+nbFractions d = foldl' (+) 0 (map (traceShowId . length . reducedProper . traceShowId) [2..d])
+
+-- Write a list of all factors
+factors = concatMap (\(x,n) -> replicate n x) . factorise
+
+-- phi, Euler's totient function
+-- https://en.wikipedia.org/wiki/Euler%27s_totient_function
+phi n
+  | isPrime n = n-1
+  | otherwise = prodPhi (factors n)
+  where
+    prodPhi [a] = a-1
+    prodPhi (a:b:t)
+      | a == b = a * prodPhi (b:t)
+      | otherwise = (a - 1) * prodPhi (b:t)
+
+-- less than 5s
+solution n = sum $ map phi [2..n]
+
+main :: IO ()
+main = do
+  let n = 1000000
+  -- print $ nbFractions n -- 303963552391
+  print $ solution n

hs-euler/euler.cabal

@@ -0,0 +1,67 @@
+-- This file has been generated from package.yaml by hpack version 0.28.2.
+--
+-- see: https://github.com/sol/hpack
+--
+-- hash: 859091034e520db697fc23b2aeb6b27cc63dfe46541d371c8bd861b7ff922014
+
+name:           euler072
+version:        0.1.0.0
+description:    Please see the README on GitHub at <https://github.com/githubuser/euler072#readme>
+homepage:       https://github.com/githubuser/euler072#readme
+bug-reports:    https://github.com/githubuser/euler072/issues
+author:         Author name here
+maintainer:     example@example.com
+copyright:      2019 Author name here
+license:        BSD3
+license-file:   LICENSE
+build-type:     Simple
+cabal-version:  >= 1.10
+extra-source-files:
+    ChangeLog.md
+    README.md
+
+source-repository head
+  type: git
+  location: https://github.com/githubuser/euler072
+
+library
+  exposed-modules:
+      Lib
+  other-modules:
+      Paths_euler072
+  hs-source-dirs:
+      src
+  build-depends:
+      arithmoi
+    , base >=4.7 && <5
+    , protolude
+  default-language: Haskell2010
+
+executable euler072-exe
+  main-is: Main.hs
+  other-modules:
+      Paths_euler072
+  hs-source-dirs:
+      app
+  ghc-options: -O -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      arithmoi
+    , base >=4.7 && <5
+    , euler072
+    , protolude
+  default-language: Haskell2010
+
+test-suite euler072-test
+  type: exitcode-stdio-1.0
+  main-is: Spec.hs
+  other-modules:
+      Paths_euler072
+  hs-source-dirs:
+      test
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      arithmoi
+    , base >=4.7 && <5
+    , euler072
+    , protolude
+  default-language: Haskell2010

hs-euler/package.yaml

@@ -0,0 +1,51 @@
+name:                euler072
+version:             0.1.0.0
+github:              "githubuser/euler072"
+license:             BSD3
+author:              "Author name here"
+maintainer:          "example@example.com"
+copyright:           "2019 Author name here"
+
+extra-source-files:
+- README.md
+- ChangeLog.md
+
+# Metadata used when publishing your package
+# synopsis:            Short description of your package
+# category:            Web
+
+# To avoid duplicated efforts in documentation and dealing with the
+# complications of embedding Haddock markup inside cabal files, it is
+# common to point users to the README.md file.
+description:         Please see the README on GitHub at <https://github.com/githubuser/euler072#readme>
+
+dependencies:
+- base >= 4.7 && < 5
+- protolude
+- arithmoi
+
+library:
+  source-dirs: src
+
+executables:
+  euler072-exe:
+    main:                Main.hs
+    source-dirs:         app
+    ghc-options:
+    - -O
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - euler072
+
+tests:
+  euler072-test:
+    main:                Spec.hs
+    source-dirs:         test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - euler072

hs-euler/src/Euler072.hs

@@ -0,0 +1,61 @@
+#!/usr/bin/env stack
+{- stack script
+   --resolver lts-13.24
+   --install-ghc
+   --package arithmoi
+-}
+
+{-
+Consider the fraction, n/d, where n and d are positive integers. If n<d and
+HCF(n,d)=1, it is called a reduced proper fraction.
+
+If we list the set of reduced proper fractions for d ≤ 8 in ascending order of
+size, we get:
+
+1/8, 1/7, 1/6, 1/5, 1/4, 2/7, 1/3, 3/8, 2/5, 3/7, 1/2, 4/7, 3/5, 5/8, 2/3, 5/7, 3/4, 4/5, 5/6, 6/7, 7/8
+
+It can be seen that there are 21 elements in this set.
+
+How many elements would be contained in the set of reduced proper fractions for
+d ≤ 1,000,000?
+-}
+{-# LANGUAGE NoImplicitPrelude #-}
+module Main where
+
+import Protolude
+
+import Math.NumberTheory.Primes
+
+reducedProper :: Integer -> [Integer]
+reducedProper d = do
+  let pf = map fst $ factorise d
+  x <- [1..d]
+  guard (not (any (\p -> x `rem` p == 0) pf))
+  return x
+
+-- Naive solution, took ages
+nbFractions :: Integer -> Int
+nbFractions d = foldl' (+) 0 (map (traceShowId . length . reducedProper . traceShowId) [2..d])
+
+-- Write a list of all factors
+factors = concatMap (\(x,n) -> replicate n x) . factorise
+
+-- phi, Euler's totient function
+-- https://en.wikipedia.org/wiki/Euler%27s_totient_function
+phi n
+  | isPrime n = n-1
+  | otherwise = prodPhi (factors n)
+  where
+    prodPhi [a] = a-1
+    prodPhi (a:b:t)
+      | a == b = a * prodPhi (b:t)
+      | otherwise = (a - 1) * prodPhi (b:t)
+
+-- less than 5s
+solution n = sum $ map phi [2..n]
+
+main :: IO ()
+main = do
+  let n = 1000000
+  -- print $ nbFractions n -- 303963552391
+  print $ solution n

hs-euler/src/Lib.hs

@@ -0,0 +1,6 @@
+module Lib
+    ( someFunc
+    ) where
+
+someFunc :: IO ()
+someFunc = putStrLn "someFunc"

hs-euler/stack.yaml

@@ -0,0 +1,65 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+# resolver: ghcjs-0.1.0_ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-13.25
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+# - location:
+#    git: https://github.com/commercialhaskell/stack.git
+#    commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#  subdirs:
+#  - auto-update
+#  - wai
+packages:
+- .
+# Dependency packages to be pulled from upstream that are not in the resolver
+# using the same syntax as the packages field.
+# (e.g., acme-missiles-0.3)
+# extra-deps: []
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=1.7"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor

hs-euler/test/Spec.hs

@@ -0,0 +1,2 @@
+main :: IO ()
+main = putStrLn "Test suite not yet implemented"

old-haskell/072.hs

@@ -0,0 +1,35 @@
+#!/usr/bin/env stack
+{- stack script
+   --resolver lts-13.24
+   --install-ghc
+   --package arithmoi
+-}
+
+{-
+Consider the fraction, n/d, where n and d are positive integers. If n<d and
+HCF(n,d)=1, it is called a reduced proper fraction.
+
+If we list the set of reduced proper fractions for d ≤ 8 in ascending order of
+size, we get:
+
+1/8, 1/7, 1/6, 1/5, 1/4, 2/7, 1/3, 3/8, 2/5, 3/7, 1/2, 4/7, 3/5, 5/8, 2/3, 5/7, 3/4, 4/5, 5/6, 6/7, 7/8
+
+It can be seen that there are 21 elements in this set.
+
+How many elements would be contained in the set of reduced proper fractions for
+d ≤ 1,000,000?
+-}
+{-# LANGUAGE NoImplicitPrelude #-}
+import Protolude
+import Math.NumberTheory.Primes
+
+-- reducedProper :: Int -> [Int]
+reducedProper d = do
+  let pf = map fst $ factorise d
+  x <- [1..d]
+  guard (some (\p -> x `rem` p == 0) pf)
+  return x
+
+main :: IO ()
+main = do
+  print $ reducedProper 8