Merge pull request #92 from AsPJT/develop

v1.0.0 MESOPOTAMIA

.editorconfig

@@ -0,0 +1,8 @@
+root = true
+[*]
+charset = utf-8-bom
+end_of_line = lf
+indent_size = 4
+indent_style = space
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/workflows/area-calculate.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: AreaCalculate
   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 

.github/workflows/cmake-all-build.yml

@@ -1,17 +1,16 @@
-name: CMake-All-Build
+name: CMake-All-Build
 
 on:
   pull_request:
-    branches: [ main ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    
+    runs-on: ubuntu-20.04
+
     strategy:
       matrix:
         compiler: [g++, clang++]
@@ -21,22 +20,21 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Checkout submodules
-      run: git submodule update --init --recursive ExternalLibrary/googletest
+      run: |
+        git submodule update --init --recursive ExternalLibrary/googletest
+        git submodule update --init --recursive ExternalLibrary/stb
 
     - name: Install dependencies
       run: |
         sudo apt-get clean
         sudo apt-get update
         sudo apt-get install libopencv-dev
-        sudo apt-get install libsfml-dev
         sudo apt-get install cmake
-        sudo apt-get install g++
 
     - name: Configure CMake
       run: |
         mkdir ${{github.workspace}}/build
-        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
+        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
-

.github/workflows/cmake-build-on-push.yml

@@ -1,17 +1,18 @@
-name: CMake-Build-On-Push
+name: CMake-Build-On-Push
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    
+    runs-on: ubuntu-ubuntu-20.04
+
     strategy:
       matrix:
         compiler: [g++, clang++]
@@ -21,7 +22,9 @@ jobs:
       uses: actions/checkout@v3
 
     - name: Checkout submodules
-      run: git submodule update --init --recursive ExternalLibrary/googletest
+      run: |
+        git submodule update --init --recursive ExternalLibrary/googletest
+        git submodule update --init --recursive ExternalLibrary/stb
 
     - name: Install dependencies
       run: |
@@ -34,8 +37,7 @@ jobs:
     - name: Configure CMake
       run: |
         mkdir ${{github.workspace}}/build
-        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
+        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
-

.github/workflows/cmake-unit-test.yml

@@ -1,54 +1,42 @@
-name: CMake-Unit-Test
+name: CMake-Unit-Test
 
 on:
-  push:
-    branches: [ main ]
   pull_request:
-    branches: [ main ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TEST_DIR: UnitTest
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        compiler: [g++, clang++]
+    runs-on: ubuntu-20.04
 
     steps:
     - name: Checkout
       uses: actions/checkout@v3
 
     - name: Checkout submodules
-      run: git submodule update --init --recursive ExternalLibrary/googletest
+      run: |
+        git submodule update --init --recursive ExternalLibrary/googletest
+        git submodule update --init --recursive ExternalLibrary/stb
 
     - name: Install dependencies
       run: |
         sudo apt-get clean
         sudo apt-get update
         sudo apt-get install libsfml-dev
         sudo apt-get install cmake
-        sudo apt-get install g++
 
     - name: Configure CMake
       run: |
         mkdir ${{github.workspace}}/build
-        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=${{matrix.compiler}} -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SFML_TEST=ON -S ${{env.WORK_SPACE}}/${{env.TEST_DIR}} -G "Unix Makefiles"
-  
+        cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}}/${{env.TEST_DIR}} -G "Unix Makefiles"
+
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target all -j 12
 
-    - name: Run tests 
+    - name: Run tests
       run: |
-        cd ${{env.WORK_SPACE}}/${{env.TEST_DIR}}/bin/
-        for file in *; do
-          if [[ -x "$file" ]]; then
-            ./"$file"
-          fi
-        done
-
-      
+        cd ${{github.workspace}}/build
+        ctest

.github/workflows/color-count.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: ColorCount
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/cppcheck.yml

@@ -0,0 +1,34 @@
+name: cppcheck
+
+on: [pull_request]
+
+env:
+  WORKSPACE: ${{ github.workspace }}
+
+jobs:
+  cppcheck:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Setup cppcheck
+      run: |
+        sudo apt-get update
+        sudo apt-get install cppcheck
+
+    - name: Run cppcheck
+      run: |
+        cd ${{ env.WORKSPACE }}
+        cppcheck --enable=all --output-file=cppcheck-result.txt --force --quiet -I Library Projects
+
+    - name: Setup reviewdog
+      uses: reviewdog/action-setup@80a06617492b461a66508e2dedf16233f0506804
+
+    - name: Comment GitHub Pull Request
+      env:
+        REVIEWDOG_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        cat cppcheck-result.txt | grep "\bwarning: " | reviewdog -efm="%f:%l:%c:%m" -reporter=github-pr-review -name="cppcheck-warning"
+        cat cppcheck-result.txt | grep "\berror: "   | reviewdog -efm="%f:%l:%c:%m" -reporter=github-pr-review -name="cppcheck-error"

.github/workflows/generate-doxygen.yml

@@ -0,0 +1,28 @@
+name: Generate-Doxygen
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Install Doxygen and Graphviz
+      run: sudo apt-get install doxygen graphviz
+
+    - name: Generate Documentation
+      run: |
+        cd ${{github.workspace}}/Document/Doxygen
+        doxygen Doxyfile
+
+    - name: Deploy to GitHub Pages
+      uses: JamesIves/[email protected]
+      with:
+        branch: gh-pages
+        folder: ${{github.workspace}}/Document/Doxygen/html

.github/workflows/image-combine.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: ImageCombine
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/image-resize.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: ImageResize
 
 jobs:

.github/workflows/image-segment.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: ImageSegment
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -26,8 +26,6 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v3
-      with:
-        submodules: 'recursive'
 
     - name: Install opencv
       run: |
@@ -37,7 +35,7 @@ jobs:
     - name: Configure CMake
       run: |
         mkdir ${{github.workspace}}/build
-        cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}} -G "Unix Makefiles"
+        cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -S ${{env.WORK_SPACE}}/GeographicDataToSimulationGrid -G "Unix Makefiles"
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --target ${{env.TARGET}} -j 12

.github/workflows/land-and-water-convert.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: LandAndWaterConvert
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/reviewdog-cpplint.yml

@@ -0,0 +1,35 @@
+name: Reviewdog-cpplint
+
+on: [pull_request]
+
+jobs:
+  cpplint:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: cpplint
+      uses: reviewdog/action-cpplint@b6c13159b10435813edfddea9e1cd02157544f45
+      with:
+        github_token: ${{ secrets.github_token }}
+        reporter: github-pr-review
+        flags: --linelength=150
+        filter: "build/include_alpha\
+          ,build/include_what_you_use\
+          ,build/storage_class\
+          ,readability/braces\
+          ,readability/casting\
+          ,readability/fn_size\
+          ,whitespace/braces\
+          ,whitespace/comma\
+          ,whitespace/comments\
+          ,whitespace/end_of_line\
+          ,whitespace/ending_newline\
+          ,whitespace/indent\
+          ,whitespace/newline\
+          ,whitespace/operators\
+          ,whitespace/parens\
+          ,whitespace/line_length\
+          "

.github/workflows/rivers-and-lakes-convert.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: RiversAndLakesConvert
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.github/workflows/soil-temperature-convert.yml

@@ -4,7 +4,7 @@ on : [ workflow_dispatch ]
 
 env:
   BUILD_TYPE: Debug
-  WORK_SPACE: ${{github.workspace}}/Project
+  WORK_SPACE: ${{github.workspace}}/Projects
   TARGET: SoilTemperatureConvert
   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 

.gitignore

@@ -277,4 +277,6 @@ AS_DEBUG/
 .DS_Store
 .vscode
 
-2010/
+2010/
+
+Document/Doxygen/*/