Haskell

.gitattributes

@@ -0,0 +1,3 @@
+**/*.nb binary
+**/*.times binary
+**/*.pdf merge=theirs

.travis.yml

@@ -1,39 +1,83 @@
-install:
-  # Silent install from conda docs
-  # https://conda.io/docs/user-guide/install/macos.html#install-macos-silent
-  # adapted using
-  # https://conda.io/docs/user-guide/tasks/use-conda-with-travis-ci.html
-
-  # Needed to check if conda already installed
-  - export PATH="$HOME/miniconda/bin:$PATH"
-
-  # If not yet installed, obtain Miniconda
-  # and tectonic
-  # From tectonic docs
-  # https://tectonic-typesetting.github.io/en-US/install.html#the-anaconda-method
-  - if ! command -v conda > /dev/null; then
-      wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
-      bash miniconda.sh -b -p $HOME/miniconda -u;
-      conda config --add channels conda-forge;
-      conda config --set always_yes yes;
-      conda update --all;
-      conda install tectonic;
-    fi
-  - conda info -a
-cache:
-  directories:
-    - $HOME/miniconda
-script: # Change working directory each time so including files will work. Change back so the pdfs can be found for deployment. This way, building multiple files goes well.
- - cd ./documentation/src/
- - tectonic ./documentation.tex --print
- - cd ../../
-deploy:
-  provider: releases
-  api_key:
-    secure: rQIugDrSWmIXr7oIIxhcpvPIAql6YYc0+4+yIyHi2iJ3jYuOT7EI/a1q81tKMvPOXs/U+vyLIhyyzstK4KXkRj0wTS+e518PE9VZyysVRkmzX8fQkScjne4ITTXOeAsxpTU9gm7QnS+evtalt5izIbsBl/6lJY0HnrVwtd7PmMB2v9IQhF+FuoZRVJF+MWBUrENNPPP6p4PLXbbZgFUaYDvQuIyZvn5EGSlSnVlUmgggkUJJtjs+H+j0M7Ju+wk1jVhO3e4VQa8lO9NN3m8U2aYz99zgT2yLZQ/gBa1OeKsVfJuhajOfnigUuGhsZD2PXPHZdLlxPI2SuxsSUmFnJesxVaTHTROz+e8d+xL90iyCq/l1p8BUiap1ZNalkbYK637TiPnxLKVKhzDDH0Sf+OjY92HK0cpBSKBCvlH+JYX4EY/DqIBubFCctc5Qd/PqcYZqyKCepadnKB+nXWpmp4n9Sr2/wA4EDdrMsRIlNHOi0cfiGleo9abJ/ZiDVUekW0Bgic3rCIZlN8S05huXuWxWJTBJvMtA1w2XyRCejapVo4EH1w8uxTClwiT4V++bMOpQK9QYd2L9vIMXy7J4h+iFhGO9vkP09ACEo40SS77+zFq79aEYTOIcqjP5uB3RhV8tKAfv4MTuL9x50yPzobr0hzTVxengQPYAmEldQj4=
-  file:
-  - ./documentation/src/documentation.pdf
-  skip_cleanup: true
-  on:
-    tags: true
-    branch: master
+jobs:
+  include:
+    - stage: core-haskell
+      # config from https://docs.haskellstack.org/en/stable/travis_ci/#running-tests
+      # haddock coverage is also shown in the build log
+
+      # Use new container infrastructure to enable caching
+      sudo: false
+
+      # Do not choose a language; we provide our own build tools.
+      language: generic
+
+      # Caching so the next build will be fast too.
+#      cache:
+#        directories:
+#        - $HOME/.stack
+
+      # Ensure necessary system libraries are present
+      addons:
+        apt:
+          packages:
+            - libgmp-dev
+
+      before_install:
+      - cd ./SolArduino-core/haskell/solarduino-haskell
+      # Download and unpack the stack executable
+      - mkdir -p ~/.local/bin
+      - export PATH=$HOME/.local/bin:$PATH
+      - travis_retry curl -L https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
+
+      install:
+      # Build dependencies
+      - stack --no-terminal --install-ghc test --only-dependencies
+
+      script:
+      # Build the package, its tests, and its docs and run the tests
+      - stack --no-terminal test --haddock --no-haddock-deps --coverage
+
+      # Upload to coveralls using Stack HPC Coveralls (SHC)
+      after_success:
+        - travis_retry curl -L https://github.com/rubik/stack-hpc-coveralls/releases/download/v0.0.4.0/shc-linux-x64-8.0.1.tar.bz2 | tar -xj
+        - ./shc solarduino-haskell solarduino-haskell-test
+    - stage: documentation
+      language: generic
+      install:
+        # Silent install from conda docs
+        # https://conda.io/docs/user-guide/install/macos.html#install-macos-silent
+        # adapted using
+        # https://conda.io/docs/user-guide/tasks/use-conda-with-travis-ci.html
+
+        # Needed to check if conda already installed
+        - export PATH="$HOME/miniconda/bin:$PATH"
+
+        # If not yet installed, obtain Miniconda
+        # and tectonic
+        # From tectonic docs
+        # https://tectonic-typesetting.github.io/en-US/install.html#the-anaconda-method
+        - if ! command -v conda > /dev/null; then
+            wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh;
+            bash miniconda.sh -b -p $HOME/miniconda -u;
+            conda config --add channels conda-forge;
+            conda config --set always_yes yes;
+            conda update --all;
+            conda install tectonic;
+          fi
+        - conda info -a
+      cache:
+        directories:
+          - $HOME/miniconda
+      script: # Change working directory each time so including files will work. Change back so the pdfs can be found for deployment. This way, building multiple files goes well.
+       - cd ./documentation/src/
+       - tectonic ./documentation.tex --print
+       - cd ../../
+      deploy:
+        provider: releases
+        api_key:
+          secure: rQIugDrSWmIXr7oIIxhcpvPIAql6YYc0+4+yIyHi2iJ3jYuOT7EI/a1q81tKMvPOXs/U+vyLIhyyzstK4KXkRj0wTS+e518PE9VZyysVRkmzX8fQkScjne4ITTXOeAsxpTU9gm7QnS+evtalt5izIbsBl/6lJY0HnrVwtd7PmMB2v9IQhF+FuoZRVJF+MWBUrENNPPP6p4PLXbbZgFUaYDvQuIyZvn5EGSlSnVlUmgggkUJJtjs+H+j0M7Ju+wk1jVhO3e4VQa8lO9NN3m8U2aYz99zgT2yLZQ/gBa1OeKsVfJuhajOfnigUuGhsZD2PXPHZdLlxPI2SuxsSUmFnJesxVaTHTROz+e8d+xL90iyCq/l1p8BUiap1ZNalkbYK637TiPnxLKVKhzDDH0Sf+OjY92HK0cpBSKBCvlH+JYX4EY/DqIBubFCctc5Qd/PqcYZqyKCepadnKB+nXWpmp4n9Sr2/wA4EDdrMsRIlNHOi0cfiGleo9abJ/ZiDVUekW0Bgic3rCIZlN8S05huXuWxWJTBJvMtA1w2XyRCejapVo4EH1w8uxTClwiT4V++bMOpQK9QYd2L9vIMXy7J4h+iFhGO9vkP09ACEo40SS77+zFq79aEYTOIcqjP5uB3RhV8tKAfv4MTuL9x50yPzobr0hzTVxengQPYAmEldQj4=
+        file:
+        - ./documentation/src/documentation.pdf
+        skip_cleanup: true
+        on:
+          tags: true
+          branch: master

README.md

@@ -1,4 +1,5 @@
 # [Link to website](https://phpirates.github.io/SolArduino/) 
 
-Documentation: 
 [![Build Status](https://api.travis-ci.org/PHPirates/SolArduino.svg)](https://travis-ci.org/PHPirates/SolArduino)
+
+Core 'best angle' calculations (Haskell): [![Coverage Status](https://coveralls.io/repos/github/PHPirates/SolArduino/badge.svg?branch=master)](https://coveralls.io/github/PHPirates/SolArduino?branch=master)

SolArduino-core/Mathematica/realdata.nb

@@ -10,10 +10,10 @@
 NotebookFileLineBreakTest
 NotebookFileLineBreakTest
 NotebookDataPosition[       158,          7]
-NotebookDataLength[     48634,       1031]
-NotebookOptionsPosition[     48188,       1012]
-NotebookOutlinePosition[     48530,       1027]
-CellTagsIndexPosition[     48487,       1024]
+NotebookDataLength[     49326,       1044]
+NotebookOptionsPosition[     48605,       1025]
+NotebookOutlinePosition[     48947,       1040]
+CellTagsIndexPosition[     48904,       1037]
 WindowFrame->Normal*)
 
 (* Beginning of Notebook Content *)
@@ -214,7 +214,8 @@ Documentation\\\\Mathematica\\\\data17_23.csv\>\"", "]"}]}], ";"}],
    3.6805898404778385`*^9, 3.6805898732783995`*^9}, {3.6805933772018414`*^9, 
    3.6805934321937127`*^9}, {3.680763998307108*^9, 3.680764022006867*^9}, {
    3.680935017347929*^9, 3.680935063675138*^9}, {3.6809350955363197`*^9, 
-   3.6809352146378307`*^9}}],
+   3.6809352146378307`*^9}},ExpressionUUID->"7a6e9e07-914a-47f8-a92d-\
+4236bb146c58"],
 
 Cell[BoxData[
  TemplateBox[{GraphicsBox[{{}, {{{}, {}, {
@@ -415,8 +416,9 @@ Sg==
                     0.4731986666666667], FrameTicks -> None, PlotRangePadding -> 
                     None, ImageSize -> 
                     Dynamic[{
-                    Automatic, 1.35 CurrentValue["FontCapHeight"]/
-                    AbsoluteCurrentValue[Magnification]}]], 
+                    Automatic, 
+                    1.35 (CurrentValue["FontCapHeight"]/AbsoluteCurrentValue[
+                    Magnification])}]], 
                     "RGBColor[0.368417, 0.506779, 0.709798]"], Appearance -> 
                     None, BaseStyle -> {}, BaselinePosition -> Baseline, 
                     DefaultBaseStyle -> {}, ButtonFunction :> 
@@ -460,8 +462,9 @@ Sg==
                     0.587148, 0.40736066666666665`, 0.09470066666666668], 
                     FrameTicks -> None, PlotRangePadding -> None, ImageSize -> 
                     Dynamic[{
-                    Automatic, 1.35 CurrentValue["FontCapHeight"]/
-                    AbsoluteCurrentValue[Magnification]}]], 
+                    Automatic, 
+                    1.35 (CurrentValue["FontCapHeight"]/AbsoluteCurrentValue[
+                    Magnification])}]], 
                     "RGBColor[0.880722, 0.611041, 0.142051]"], Appearance -> 
                     None, BaseStyle -> {}, BaselinePosition -> Baseline, 
                     DefaultBaseStyle -> {}, ButtonFunction :> 
@@ -505,8 +508,9 @@ Sg==
                     0.37345400000000006`, 0.461046, 0.12992333333333334`], 
                     FrameTicks -> None, PlotRangePadding -> None, ImageSize -> 
                     Dynamic[{
-                    Automatic, 1.35 CurrentValue["FontCapHeight"]/
-                    AbsoluteCurrentValue[Magnification]}]], 
+                    Automatic, 
+                    1.35 (CurrentValue["FontCapHeight"]/AbsoluteCurrentValue[
+                    Magnification])}]], 
                     "RGBColor[0.560181, 0.691569, 0.194885]"], Appearance -> 
                     None, BaseStyle -> {}, BaselinePosition -> Baseline, 
                     DefaultBaseStyle -> {}, ButtonFunction :> 
@@ -551,8 +555,9 @@ Sg==
                     0.13945266666666667`], FrameTicks -> None, 
                     PlotRangePadding -> None, ImageSize -> 
                     Dynamic[{
-                    Automatic, 1.35 CurrentValue["FontCapHeight"]/
-                    AbsoluteCurrentValue[Magnification]}]], 
+                    Automatic, 
+                    1.35 (CurrentValue["FontCapHeight"]/AbsoluteCurrentValue[
+                    Magnification])}]], 
                     "RGBColor[0.922526, 0.385626, 0.209179]"], Appearance -> 
                     None, BaseStyle -> {}, BaselinePosition -> Baseline, 
                     DefaultBaseStyle -> {}, ButtonFunction :> 
@@ -622,7 +627,8 @@ Sg==
    3.680583676015376*^9, 3.680583736847559*^9, 3.6805838098134108`*^9, 
    3.6805839251211615`*^9, {3.6805895003680706`*^9, 3.680589516193618*^9}, 
    3.6805898762683077`*^9, 3.68059341816064*^9, 3.6809352397996964`*^9, 
-   3.6809370898214664`*^9}]
+   3.6809370898214664`*^9},ExpressionUUID->"a499410e-f4a8-4db8-8a13-\
+f13bb5217385"]
 }, Open  ]],
 
 Cell[BoxData[
@@ -713,7 +719,8 @@ hR0sy9jDFnawrPz7B/4Cco4=
      Scaled[0.02]}, {
      Scaled[0.02], 
      Scaled[0.05]}},
-  Ticks->{Automatic, Automatic}]], "Input"],
+  Ticks->{Automatic, Automatic}]], "Input",ExpressionUUID->"36730ec5-2a52-\
+4983-ba5d-d2cc17e57ae0"],
 
 Cell[BoxData[{
  RowBox[{
@@ -937,14 +944,17 @@ Cell[BoxData[{
      RowBox[{"\"\<17-08-2016 23:45\>\"", ",", "0"}], "}"}]}], 
    "}"}]}]}], "Input",
  CellChangeTimes->{{3.680589796228764*^9, 3.6805898179566164`*^9}, {
-  3.680589890184986*^9, 3.680589892852271*^9}}],
+  3.680589890184986*^9, 
+  3.680589892852271*^9}},ExpressionUUID->"08b6f679-25af-4212-92db-\
+143ea46c06dc"],
 
 Cell[BoxData[{
  RowBox[{
   RowBox[{"13", "/", "5"}], " ", 
   GraphicsBox[{{}, {{}, {}, 
      {RGBColor[0.368417, 0.506779, 0.709798], PointSize[
       0.016666666666666666`], AbsoluteThickness[1.6], LineBox[CompressedData["
+
 1:eJxdlE1IVFEYhg9B2CImFxkyKGpEhESZ2Thp6ufYaOqoM+NcszDwJ41AaCpo
 IUWHLJA2FRlkfxT9X39auK+hjYGEQbioXeAicCORUNKi5H1PMN+F4eWZ53vv
 mXvP3FvSfyY5uMEY0/vvs544VupM9iHZuElxruKtivMVFyguVrxd8Q7FOxXv
@@ -971,6 +981,7 @@ fg535XGfxJNI7fcvU6V8L1j23JFRbLqyWRRbxRnF5qjqK7aKM4pN93/+C7wd
    GridLinesStyle->Directive[
      GrayLevel[0.5, 0.4]],
    ImagePadding->All,
+   ImageSize->{587., Automatic},
    Method->{"CoordinatesToolOptions" -> {"DisplayFunction" -> ({
          (Part[{{Identity, Identity}, {Identity, Identity}}, 1, 2][#]& )[
           Part[#, 1]], 
@@ -1008,11 +1019,13 @@ fg535XGfxJNI7fcvU6V8L1j23JFRbLqyWRRbxRnF5qjqK7aKM4pN93/+C7wd
    "58.1667", ",", "20.1667", ",", "0", ",", "0", ",", "0", ",", "0", ",", 
    "0", ",", "0", ",", "0", ",", "0", ",", "0", ",", "0", ",", "0"}], 
   "}"}]}], "Input",
- CellChangeTimes->{{3.6805934469706964`*^9, 3.6805934663920503`*^9}}]
+ CellChangeTimes->{{3.6805934469706964`*^9, 
+  3.6805934663920503`*^9}},ExpressionUUID->"abaa60a3-6ee6-4651-9f07-\
+9624aff9d46f"]
 },
 WindowSize->{942, 960},
 WindowMargins->{{Automatic, 206}, {Automatic, 1}},
-FrontEndVersion->"11.0 for Microsoft Windows (64-bit) (July 28, 2016)",
+FrontEndVersion->"11.3 for Microsoft Windows (64-bit) (March 6, 2018)",
 StyleDefinitions->"Default.nb"
 ]
 (* End of Notebook Content *)
@@ -1027,12 +1040,12 @@ CellTagsIndex->{}
 (*NotebookFileOutline
 Notebook[{
 Cell[CellGroupData[{
-Cell[580, 22, 9281, 194, 867, "Input"],
-Cell[9864, 218, 20262, 406, 570, "Output"]
+Cell[580, 22, 9338, 195, 865, "Input",ExpressionUUID->"7a6e9e07-914a-47f8-a92d-4236bb146c58"],
+Cell[9921, 219, 20411, 411, 241, "Output",ExpressionUUID->"a499410e-f4a8-4db8-8a13-f13bb5217385"]
 }, Open  ]],
-Cell[30141, 627, 4401, 88, 798, "Input"],
-Cell[34545, 717, 10048, 222, 696, "Input"],
-Cell[44596, 941, 3588, 69, 196, "Input"]
+Cell[30347, 633, 4458, 89, 796, "Input",ExpressionUUID->"36730ec5-2a52-4983-ba5d-d2cc17e57ae0"],
+Cell[34808, 724, 10108, 224, 675, "Input",ExpressionUUID->"08b6f679-25af-4212-92db-143ea46c06dc"],
+Cell[44919, 950, 3682, 73, 505, "Input",ExpressionUUID->"abaa60a3-6ee6-4651-9f07-9624aff9d46f"]
 }
 ]
 *)