Please enter the commit message for your changes. Lines starting

haskell-old/CHANGELOG.md

@@ -1,11 +0,0 @@
-# Changelog for `pcc-haskell`
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to the
-[Haskell Package Versioning Policy](https://pvp.haskell.org/).
-
-## Unreleased
-
-## 0.1.0.0 - YYYY-MM-DD

haskell-old/LICENSE

@@ -1,30 +0,0 @@
-Copyright Author name here (c) 2024
-
-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.

haskell-old/README.md

@@ -1 +0,0 @@
-# pcc-haskell

haskell-old/Setup.hs

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

haskell-old/app/Main.hs

@@ -1,73 +0,0 @@
-module Main (main) where
-
-import PolyCube
-import Text.Read (readMaybe)
-import System.Exit ( ExitCode(ExitFailure), exitWith )
-import System.Environment (getArgs)
-import qualified Data.HashMap.Strict as Map
-import Combinatorics
-
-main :: IO ()
-main = do
-    maxSize <- parseCLIArgs
-    let cube = PolyCube (map (const [Coord3D (0, 0, 0)]) ([1..24]::[Int])) [Coord3D (0, 0, 0)] 1
-    let polycubes = Map.singleton (getOffsets $ head $ orientations cube) (size cube, head $ orientations cube)
-    let result = evaluateChildren maxSize cube polycubes
-    let counts = foldr (increment . fst) [] result
-    writeFile "count.out" $ show counts
-    return ()
-
-increment :: Int -> [Int] -> [Int]
-increment 1 [] = [1]
-increment n [] = 0:increment (n-1) []
-increment 1 (x:xs) = (x+1):xs
-increment n (x:xs) = x:increment (n-1) xs
-
-parseCLIArgs :: IO Int
-parseCLIArgs = do
-    args <- getArgs
-    let maxSize = readMaybe $ head args :: Maybe Int
-    maybe (exitWith $ ExitFailure 1) return maxSize
-
-evaluateChildren :: Int -> PolyCube -> Map.HashMap [Offset3D] (Int, [Coord3D]) -> Map.HashMap [Offset3D] (Int, [Coord3D])
-evaluateChildren maxSize polycube = loop (getChildren (maxSize - size polycube) polycube) where
-    loop :: [PolyCube] -> Map.HashMap [Offset3D] (Int, [Coord3D]) -> Map.HashMap [Offset3D] (Int, [Coord3D])
-    loop [] d = d
-    loop ((PolyCube o la s):pcs) d = if any (flip Map.member d . getOffsets) o
-        then loop pcs d
-        else loop pcs $ evaluateChildren maxSize (PolyCube o la s) $ Map.insert (getOffsets $ head o) (s, head o) d
-
-getChildren :: Int -> PolyCube -> [PolyCube]
-getChildren 0 _ = []
-getChildren i (PolyCube o la s) = foldr condGrowth [] $ foldr (\x acc -> tuples x possibleGrowth ++ acc) [] [1..i] where
-    condGrowth :: [Coord3D] -> [PolyCube] -> [PolyCube]
-    condGrowth gs ps = if any (\x -> elem x $ head o) gs
-        then ps
-        else PolyCube (zipWith (\x n -> insertAllSorted x $ rotateCubes gs n) o [1..24]) gs (s + length gs) : ps
-    transformations :: [Offset3D]
-    transformations = [
-        Offset3D (-1, 0, 0),
-        Offset3D (0, -1, 0),
-        Offset3D (0, 0, -1),
-        Offset3D (1, 0, 0),
-        Offset3D (0, 1, 0),
-        Offset3D (0, 0, 1)]
-    applyTransformations :: Coord3D -> [Offset3D] -> [Coord3D]
-    applyTransformations _ [] = []
-    applyTransformations p (x:xs) = applyOffset p x:applyTransformations p xs
-    possibleGrowth :: [Coord3D]
-    possibleGrowth = foldr (\x acc -> insertAllSorted acc (applyTransformations x transformations)) [] la
-
-insertAllSorted :: (Ord a) => [a] -> [a] -> [a]
-insertAllSorted [] [] = []
-insertAllSorted [] [v] = [v]
-insertAllSorted xs [] = xs
-insertAllSorted xs (y:ys) = insertAllSorted (insertSorted xs y) ys
-
-insertSorted :: (Ord a) => [a] -> a -> [a]
-insertSorted [] v = [v]
-insertSorted (x:xs) v
-    | v < x     = v:x:xs
-    | v > x     = insertSorted xs v
-    | otherwise = x:xs
-

haskell-old/package.yaml

@@ -1,65 +0,0 @@
-name:                pcc-haskell
-version:             0.1.0.0
-github:              "githubuser/pcc-haskell"
-license:             BSD-3-Clause
-author:              "Author name here"
-maintainer:          "example@example.com"
-copyright:           "2024 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/pcc-haskell#readme>
-
-dependencies:
-- base >= 4.7 && < 5
-
-ghc-options:
-- -Wall
-- -Wcompat
-- -Widentities
-- -Wincomplete-record-updates
-- -Wincomplete-uni-patterns
-- -Wmissing-export-lists
-- -Wmissing-home-modules
-- -Wpartial-fields
-- -Wredundant-constraints
-
-library:
-  source-dirs: src
-  dependencies:
-    - hashable
-
-executables:
-  pcc-haskell-exe:
-    main:                Main.hs
-    source-dirs:         app
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - pcc-haskell
-    - unordered-containers
-    - combinatorial
-
-tests:
-  pcc-haskell-test:
-    main:                Spec.hs
-    source-dirs:         test
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    dependencies:
-    - pcc-haskell
-    - unordered-containers
-    - combinatorial

haskell-old/pcc-haskell.cabal

@@ -1,72 +0,0 @@
-cabal-version: 2.2
-
--- This file has been generated from package.yaml by hpack version 0.36.0.
---
--- see: https://github.com/sol/hpack
-
-name:           pcc-haskell
-version:        0.1.0.0
-description:    Please see the README on GitHub at <https://github.com/githubuser/pcc-haskell#readme>
-homepage:       https://github.com/githubuser/pcc-haskell#readme
-bug-reports:    https://github.com/githubuser/pcc-haskell/issues
-author:         Author name here
-maintainer:     example@example.com
-copyright:      2024 Author name here
-license:        BSD-3-Clause
-license-file:   LICENSE
-build-type:     Simple
-extra-source-files:
-    README.md
-    CHANGELOG.md
-
-source-repository head
-  type: git
-  location: https://github.com/githubuser/pcc-haskell
-
-library
-  exposed-modules:
-      PolyCube
-  other-modules:
-      Paths_pcc_haskell
-  autogen-modules:
-      Paths_pcc_haskell
-  hs-source-dirs:
-      src
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
-  build-depends:
-      base >=4.7 && <5
-    , hashable
-  default-language: Haskell2010
-
-executable pcc-haskell-exe
-  main-is: Main.hs
-  other-modules:
-      Paths_pcc_haskell
-  autogen-modules:
-      Paths_pcc_haskell
-  hs-source-dirs:
-      app
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      base >=4.7 && <5
-    , combinatorial
-    , pcc-haskell
-    , unordered-containers
-  default-language: Haskell2010
-
-test-suite pcc-haskell-test
-  type: exitcode-stdio-1.0
-  main-is: Spec.hs
-  other-modules:
-      Paths_pcc_haskell
-  autogen-modules:
-      Paths_pcc_haskell
-  hs-source-dirs:
-      test
-  ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
-  build-depends:
-      base >=4.7 && <5
-    , combinatorial
-    , pcc-haskell
-    , unordered-containers
-  default-language: Haskell2010

haskell-old/stack.yaml

@@ -1,67 +0,0 @@
-# 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-21.13
-# resolver: nightly-2023-09-24
-# resolver: ghc-9.6.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/2023-01-01.yaml
-resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml
-
-# 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
-#   subdirs:
-#   - auto-update
-#   - wai
-packages:
-- .
-# Dependency packages to be pulled from upstream that are not in the resolver.
-# These entries can reference officially published versions as well as
-# forks / in-progress versions pinned to a git hash. For example:
-#
-# extra-deps:
-# - acme-missiles-0.3
-# - git: https://github.com/commercialhaskell/stack.git
-#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#
-# 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: ">=2.13"
-#
-# 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

haskell-old/test/Spec.hs

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

haskell/.gitignore

@@ -1,2 +0,0 @@
-.stack-work/
-*~

haskell/app/Main.hs

@@ -1,6 +1,73 @@
 module Main (main) where
 
-import Lib
+import PolyCube
+import Text.Read (readMaybe)
+import System.Exit ( ExitCode(ExitFailure), exitWith )
+import System.Environment (getArgs)
+import qualified Data.HashMap.Strict as Map
+import Combinatorics
 
 main :: IO ()
-main = someFunc
+main = do
+    maxSize <- parseCLIArgs
+    let cube = PolyCube (map (const [Coord3D (0, 0, 0)]) ([1..24]::[Int])) [Coord3D (0, 0, 0)] 1
+    let polycubes = Map.singleton (getOffsets $ head $ orientations cube) (size cube, head $ orientations cube)
+    let result = evaluateChildren maxSize cube polycubes
+    let counts = foldr (increment . fst) [] result
+    writeFile "count.out" $ show counts
+    return ()
+
+increment :: Int -> [Int] -> [Int]
+increment 1 [] = [1]
+increment n [] = 0:increment (n-1) []
+increment 1 (x:xs) = (x+1):xs
+increment n (x:xs) = x:increment (n-1) xs
+
+parseCLIArgs :: IO Int
+parseCLIArgs = do
+    args <- getArgs
+    let maxSize = readMaybe $ head args :: Maybe Int
+    maybe (exitWith $ ExitFailure 1) return maxSize
+
+evaluateChildren :: Int -> PolyCube -> Map.HashMap [Offset3D] (Int, [Coord3D]) -> Map.HashMap [Offset3D] (Int, [Coord3D])
+evaluateChildren maxSize polycube = loop (getChildren (maxSize - size polycube) polycube) where
+    loop :: [PolyCube] -> Map.HashMap [Offset3D] (Int, [Coord3D]) -> Map.HashMap [Offset3D] (Int, [Coord3D])
+    loop [] d = d
+    loop ((PolyCube o la s):pcs) d = if any (flip Map.member d . getOffsets) o
+        then loop pcs d
+        else loop pcs $ evaluateChildren maxSize (PolyCube o la s) $ Map.insert (getOffsets $ head o) (s, head o) d
+
+getChildren :: Int -> PolyCube -> [PolyCube]
+getChildren 0 _ = []
+getChildren i (PolyCube o la s) = foldr condGrowth [] $ foldr (\x acc -> tuples x possibleGrowth ++ acc) [] [1..i] where
+    condGrowth :: [Coord3D] -> [PolyCube] -> [PolyCube]
+    condGrowth gs ps = if any (\x -> elem x $ head o) gs
+        then ps
+        else PolyCube (zipWith (\x n -> insertAllSorted x $ rotateCubes gs n) o [1..24]) gs (s + length gs) : ps
+    transformations :: [Offset3D]
+    transformations = [
+        Offset3D (-1, 0, 0),
+        Offset3D (0, -1, 0),
+        Offset3D (0, 0, -1),
+        Offset3D (1, 0, 0),
+        Offset3D (0, 1, 0),
+        Offset3D (0, 0, 1)]
+    applyTransformations :: Coord3D -> [Offset3D] -> [Coord3D]
+    applyTransformations _ [] = []
+    applyTransformations p (x:xs) = applyOffset p x:applyTransformations p xs
+    possibleGrowth :: [Coord3D]
+    possibleGrowth = foldr (\x acc -> insertAllSorted acc (applyTransformations x transformations)) [] la
+
+insertAllSorted :: (Ord a) => [a] -> [a] -> [a]
+insertAllSorted [] [] = []
+insertAllSorted [] [v] = [v]
+insertAllSorted xs [] = xs
+insertAllSorted xs (y:ys) = insertAllSorted (insertSorted xs y) ys
+
+insertSorted :: (Ord a) => [a] -> a -> [a]
+insertSorted [] v = [v]
+insertSorted (x:xs) v
+    | v < x     = v:x:xs
+    | v > x     = insertSorted xs v
+    | otherwise = x:xs
+

haskell/package.yaml

@@ -35,6 +35,8 @@ ghc-options:
 
 library:
   source-dirs: src
+  dependencies:
+    - hashable
 
 executables:
   pcc-haskell-exe:
@@ -46,6 +48,8 @@ executables:
     - -with-rtsopts=-N
     dependencies:
     - pcc-haskell
+    - unordered-containers
+    - combinatorial
 
 tests:
   pcc-haskell-test:
@@ -57,3 +61,5 @@ tests:
     - -with-rtsopts=-N
     dependencies:
     - pcc-haskell
+    - unordered-containers
+    - combinatorial

haskell/pcc-haskell.cabal

@@ -25,7 +25,7 @@ source-repository head
 
 library
   exposed-modules:
-      Lib
+      PolyCube
   other-modules:
       Paths_pcc_haskell
   autogen-modules:
@@ -35,6 +35,7 @@ library
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-depends:
       base >=4.7 && <5
+    , hashable
   default-language: Haskell2010
 
 executable pcc-haskell-exe
@@ -48,7 +49,9 @@ executable pcc-haskell-exe
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
+    , combinatorial
     , pcc-haskell
+    , unordered-containers
   default-language: Haskell2010
 
 test-suite pcc-haskell-test
@@ -63,5 +66,7 @@ test-suite pcc-haskell-test
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
+    , combinatorial
     , pcc-haskell
+    , unordered-containers
   default-language: Haskell2010

haskell/src/Lib.hs

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

haskell/stack.yaml

@@ -8,9 +8,9 @@
 # A snapshot resolver dictates the compiler version and the set of packages
 # to be used for project dependencies. For example:
 #
-# resolver: lts-22.7
+# resolver: lts-21.13
-# resolver: nightly-2024-01-20
+# resolver: nightly-2023-09-24
-# resolver: ghc-9.6.4
+# resolver: ghc-9.6.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.
@@ -18,7 +18,7 @@
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2023-01-01.yaml
 resolver:
-  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/15.yaml
+  url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
@@ -53,7 +53,7 @@ packages:
 #
 # Require a specific version of Stack, using version ranges
 # require-stack-version: -any # Default
-# require-stack-version: ">=2.15"
+# require-stack-version: ">=2.13"
 #
 # Override the architecture used by Stack, especially useful on Windows
 # arch: i386

haskell/test/Spec.hs

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