diff --git a/pcc-haskell/.gitignore b/pcc-haskell/.gitignore new file mode 100644 index 0000000..c368d45 --- /dev/null +++ b/pcc-haskell/.gitignore @@ -0,0 +1,2 @@ +.stack-work/ +*~ \ No newline at end of file diff --git a/pcc-haskell/CHANGELOG.md b/pcc-haskell/CHANGELOG.md new file mode 100644 index 0000000..fce9b9f --- /dev/null +++ b/pcc-haskell/CHANGELOG.md @@ -0,0 +1,11 @@ +# 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 diff --git a/pcc-haskell/LICENSE b/pcc-haskell/LICENSE new file mode 100644 index 0000000..98e2291 --- /dev/null +++ b/pcc-haskell/LICENSE @@ -0,0 +1,30 @@ +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. diff --git a/pcc-haskell/README.md b/pcc-haskell/README.md new file mode 100644 index 0000000..302ec3a --- /dev/null +++ b/pcc-haskell/README.md @@ -0,0 +1 @@ +# pcc-haskell diff --git a/pcc-haskell/Setup.hs b/pcc-haskell/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/pcc-haskell/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/pcc-haskell/app/Main.hs b/pcc-haskell/app/Main.hs new file mode 100644 index 0000000..cd0a228 --- /dev/null +++ b/pcc-haskell/app/Main.hs @@ -0,0 +1,10 @@ +module Main (main) where + +import PolyCube +import qualified Data.HashMap.Strict as Map + +main :: IO () +main = do + let cube = PolyCube (map (const $ [Coord3D (0, 0, 0)]) ([1..24]::[Int])) [Coord3D (0, 0, 0)] + let polycubes = Map.singleton (getOffsets $ head $ orientations cube) (head $ orientations cube) + return () diff --git a/pcc-haskell/package.yaml b/pcc-haskell/package.yaml new file mode 100644 index 0000000..e375371 --- /dev/null +++ b/pcc-haskell/package.yaml @@ -0,0 +1,63 @@ +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 + +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 + +tests: + pcc-haskell-test: + main: Spec.hs + source-dirs: test + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + dependencies: + - pcc-haskell + - unordered-containers diff --git a/pcc-haskell/pcc-haskell.cabal b/pcc-haskell/pcc-haskell.cabal new file mode 100644 index 0000000..0040544 --- /dev/null +++ b/pcc-haskell/pcc-haskell.cabal @@ -0,0 +1,70 @@ +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 +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 + , 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 + , pcc-haskell + , unordered-containers + default-language: Haskell2010 diff --git a/haskell/polycube_counting.hs b/pcc-haskell/src/PolyCube.hs similarity index 60% rename from haskell/polycube_counting.hs rename to pcc-haskell/src/PolyCube.hs index b9bb174..855a49a 100644 --- a/haskell/polycube_counting.hs +++ b/pcc-haskell/src/PolyCube.hs @@ -1,36 +1,54 @@ -import Data.HashMap.Strict +{-# LANGUAGE DeriveGeneric #-} +module PolyCube ( + Coord3D (..), + Offset3D (..), + PolyCube (..), + getOffsets, + diff, + rotateCubes +) where + +import Prelude hiding (flip) +import GHC.Generics (Generic) +import Data.Hashable newtype Coord3D = Coord3D (Int, Int, Int) - deriving Show + deriving ( + Show, + Eq, + Generic + ) +instance Hashable Coord3D newtype Offset3D = Offset3D (Int, Int, Int) - deriving Show + deriving ( + Show, + Eq, + Generic + ) +instance Hashable Offset3D data PolyCube = PolyCube { orientations :: [[Coord3D]], lastAdded :: [Coord3D] -} - -main :: IO () -main = do - let cube = PolyCube (map (const $ Cubes [Coord3D (0, 0, 0)]) [1..24]) [Coord3D (0, 0, 0)] - let polycubes = Map.singleton (getOffsets $ head $ orientations cube) head orientations cube - return () +} deriving Show getOffsets :: [Coord3D] -> [Offset3D] -getOffsets [x] = [] +getOffsets [] = error "empty List" +getOffsets [_] = [] getOffsets (x:y:xs) = diff x y:getOffsets (y:xs) diff :: Coord3D -> Coord3D -> Offset3D diff (Coord3D (a, b, c)) (Coord3D (x, y, z)) = Offset3D (x-a, y-b, z-c) -rotateCubes :: Cubes -> Int -> Cubes -rotateCubes (Cubes tree) i = Cubes $ map (invert . flip . rotate i) tree where +rotateCubes :: [Coord3D] -> Int -> [Coord3D] +rotateCubes tree n = map (invert . flip . rotate n) tree where rotate :: Int -> Coord3D -> (Int, (Int, Int, Int)) rotate i (Coord3D (a, b, c)) = case mod i 3 of 0 -> (j, (a, b, c)) 1 -> (j, (b, c, a)) 2 -> (j, (c, a, b)) + _ -> (j, (a, b, c)) where j = div i 3 flip :: (Int, (Int, Int, Int)) -> (Int, (Int, Int, Int)) @@ -39,9 +57,11 @@ rotateCubes (Cubes tree) i = Cubes $ map (invert . flip . rotate i) tree where 1 -> (j, (a, -b, -c)) 2 -> (j, (-a, b, -c)) 3 -> (j, (-a, -b, c)) + _ -> (j, (a, b, c)) where j = div i 4 invert :: (Int, (Int, Int, Int)) -> Coord3D invert (i, (a, b, c)) = case mod i 2 of 0 -> Coord3D (a, b, c) 1 -> Coord3D (-c, -b, -a) + _ -> Coord3D (a, b, c) diff --git a/pcc-haskell/stack.yaml b/pcc-haskell/stack.yaml new file mode 100644 index 0000000..baad085 --- /dev/null +++ b/pcc-haskell/stack.yaml @@ -0,0 +1,67 @@ +# 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 diff --git a/pcc-haskell/stack.yaml.lock b/pcc-haskell/stack.yaml.lock new file mode 100644 index 0000000..433458b --- /dev/null +++ b/pcc-haskell/stack.yaml.lock @@ -0,0 +1,13 @@ +# This file was autogenerated by Stack. +# You should not edit this file by hand. +# For more information, please see the documentation at: +# https://docs.haskellstack.org/en/stable/lock_files + +packages: [] +snapshots: +- completed: + sha256: 2fdd7d3e54540062ef75ca0a73ca3a804c527dbf8a4cadafabf340e66ac4af40 + size: 712469 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml + original: + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/22/11.yaml diff --git a/pcc-haskell/test/Spec.hs b/pcc-haskell/test/Spec.hs new file mode 100644 index 0000000..cd4753f --- /dev/null +++ b/pcc-haskell/test/Spec.hs @@ -0,0 +1,2 @@ +main :: IO () +main = putStrLn "Test suite not yet implemented"