Moved 'Data.Monoid.CartProduct', 'Data.Monoid.Conv', 'Data.Monoid.Con…

…v2', and 'Data.Monoid.Kronecker' modules to new 'hmatrix-monoids' package.
EMSL-NMR-EPR · Jun 4, 2017 · e50c25f · e50c25f
1 parent c2ac86e
commit e50c25f
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 8 deletions.
diff --git a/MFAPipe/MFAPipe.cabal b/MFAPipe/MFAPipe.cabal
@@ -57,6 +57,7 @@ executable mfaPipe
     glpk-hs,
     hmatrix,
     hmatrix-algorithms-gauss-jordan,
+    hmatrix-monoids,
     lens,
     levmar,
     logger,
@@ -81,10 +82,6 @@ executable mfaPipe
   other-modules:
     Data.Injective
     Data.List.Extras
-    Data.Monoid.CartProduct
-    Data.Monoid.Conv
-    Data.Monoid.Conv2
-    Data.Monoid.Kronecker
     Language.FluxJS.Conversion.Text
     Language.FluxJS.Types
     Language.INCA.Constants
@@ -177,6 +174,7 @@ library
     glpk-hs,
     hmatrix,
     hmatrix-algorithms-gauss-jordan,
+    hmatrix-monoids,
     lens,
     levmar,
     logger,
@@ -201,10 +199,6 @@ library
   exposed-modules:
     Data.Injective
     Data.List.Extras
-    Data.Monoid.CartProduct
-    Data.Monoid.Conv
-    Data.Monoid.Conv2
-    Data.Monoid.Kronecker
     Language.FluxJS.Conversion.Text
     Language.FluxJS.Types
     Language.INCA.Constants

diff --git a/hmatrix-monoids/LICENSE b/hmatrix-monoids/LICENSE
@@ -0,0 +1,12 @@
+Copyright 2016-17 Pacific Northwest National Laboratory Licensed under the
+Educational Community License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may
+obtain a copy of the License at
+
+http://www.osedu.org/licenses/ECL-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing
+permissions and limitations under the License.
diff --git a/hmatrix-monoids/README.md b/hmatrix-monoids/README.md
@@ -0,0 +1,16 @@
+# hmatrix-monoids v0.1.0.0
+
+## License (ECL-2.0)
+
+Copyright 2016-17 Pacific Northwest National Laboratory Licensed under the
+Educational Community License, Version 2.0 (the "License"); you may
+not use this file except in compliance with the License. You may
+obtain a copy of the License at
+
+http://www.osedu.org/licenses/ECL-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an "AS IS"
+BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+or implied. See the License for the specific language governing
+permissions and limitations under the License.
diff --git a/hmatrix-monoids/Setup.hs b/hmatrix-monoids/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/hmatrix-monoids/hmatrix-monoids.cabal b/hmatrix-monoids/hmatrix-monoids.cabal
@@ -0,0 +1,24 @@
+name:                hmatrix-monoids
+version:             0.1.0.0
+-- synopsis:
+-- description:
+-- homepage:
+license:             OtherLicense
+license-file:        LICENSE
+author:              Mark Borkum
+maintainer:          mark.borkum@pnnl.gov
+copyright:           2016-17 Pacific Northwest National Laboratory
+category:            System
+build-type:          Simple
+extra-source-files:  README.md
+cabal-version:       >=1.10
+
+library
+  hs-source-dirs:      src
+  exposed-modules:     Data.Monoid.CartProduct
+                     , Data.Monoid.Conv
+                     , Data.Monoid.Conv2
+                     , Data.Monoid.Kronecker
+  build-depends:       base >= 4.7 && < 5
+                     , hmatrix
+  default-language:    Haskell2010
diff --git a/MFAPipe/src/Data/Monoid/CartProduct.hs → ...ix-monoids/src/Data/Monoid/CartProduct.hs b/MFAPipe/src/Data/Monoid/CartProduct.hs → ...ix-monoids/src/Data/Monoid/CartProduct.hs
diff --git a/MFAPipe/src/Data/Monoid/Conv.hs → hmatrix-monoids/src/Data/Monoid/Conv.hs b/MFAPipe/src/Data/Monoid/Conv.hs → hmatrix-monoids/src/Data/Monoid/Conv.hs
diff --git a/MFAPipe/src/Data/Monoid/Conv2.hs → hmatrix-monoids/src/Data/Monoid/Conv2.hs b/MFAPipe/src/Data/Monoid/Conv2.hs → hmatrix-monoids/src/Data/Monoid/Conv2.hs
diff --git a/MFAPipe/src/Data/Monoid/Kronecker.hs → hmatrix-monoids/src/Data/Monoid/Kronecker.hs b/MFAPipe/src/Data/Monoid/Kronecker.hs → hmatrix-monoids/src/Data/Monoid/Kronecker.hs
diff --git a/stack.yaml b/stack.yaml
@@ -15,6 +15,7 @@ packages:
 - fgl-instances
 - fgl-lens
 - hmatrix-algorithms-gauss-jordan
+- hmatrix-monoids
 - logger-instances
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)