serkor1 · serkor1 · Mar 23, 2025 · Mar 20, 2025 · Mar 20, 2025 · Mar 20, 2025
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -30,3 +30,4 @@ README_files
 NEWS_cache
 NEWS_files
 ^CRAN-SUBMISSION$
+m4
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+* text=auto 
+*.ac text eol=lf
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -15,189 +15,92 @@ concurrency:
 permissions: read-all
 
 jobs:
-  R-CMD-check:
-    runs-on: ${{ matrix.config.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          # Ubuntu
-          - {os: ubuntu-latest,   r: 'devel',     compiler: 'default', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release',   compiler: 'default'}
-          - {os: ubuntu-latest,   r: 'oldrel-1',  compiler: 'default'}
-
-          # Windows
-          - {os: windows-latest,  r: 'devel',     compiler: 'default'}
-          - {os: windows-latest,  r: 'release',   compiler: 'default'}
-          - {os: windows-latest,  r: 'oldrel-1',  compiler: 'default'}
-
-          # macOS Clang
-          - {os: macos-latest,    r: 'devel',     compiler: 'clang'}
-          - {os: macos-latest,    r: 'release',   compiler: 'clang'}
-          - {os: macos-latest,    r: 'oldrel-1',  compiler: 'clang'}
-
-          # macOS GCC via Homebrew
-          - {os: macos-latest,    r: 'devel',     compiler: 'gcc'}
-          - {os: macos-latest,    r: 'release',   compiler: 'gcc'}
-          - {os: macos-latest,    r: 'oldrel-1',  compiler: 'gcc'}
-
-    env:
-      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      R_KEEP_PKG_SOURCE: yes
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup pandoc
-        uses: r-lib/actions/setup-pandoc@v2
-
-      - name: Install and update build tools (macOS)
-        if: runner.os == 'macOS'
-        run: |
-          # update and upgrade
-          # everything brew-related
-          brew update
-          brew upgrade
-
-          # reinstall important
-          # libraries
-          brew reinstall gcc
-          brew reinstall pkg-config
-          brew reinstall gettext
-          brew install libomp
-
-          # clean up eveything
-          brew cleanup
-
-          # creatre folders
-          # and symbolic links
-          sudo mkdir -p /opt/R/arm64/lib
-          sudo ln -sf $(brew --prefix gettext)/lib/libintl.a /opt/R/arm64/lib/libintl.a
-
-
-      - name: Configure Makevars (macOS-gcc)
-        if: runner.os == 'macOS' && matrix.config.compiler == 'gcc'
-        run: |
-          mkdir -p ~/.R
-          GCC_PATH=$(brew --prefix gcc)
-          OMP_PATH=$(brew --prefix libomp)
-          SDK_PATH=$(xcrun --show-sdk-path)
-
-          GCC_BIN=gcc-14
-          GXX_BIN=g++-14
-
-          cat << EOF > ~/.R/Makevars
-          # Compiler settings
-          CC=${GCC_PATH}/bin/${GCC_BIN}
-          CXX=${GCC_PATH}/bin/${GXX_BIN}
-          CXX11=${GCC_PATH}/bin/${GXX_BIN}
-          CXX14=${GCC_PATH}/bin/${GXX_BIN}
-          CXX17=${GCC_PATH}/bin/${GXX_BIN}
-          CXX20=${GCC_PATH}/bin/${GXX_BIN}
-
-          OMP_LIB=${OMP_PATH}/lib
-          OMP_INC=${OMP_PATH}/include
-
-          # Compiler flags
-          CPPFLAGS=-I\${OMP_INC} -isysroot ${SDK_PATH} -fopenmp
-          CFLAGS=-O3 -pedantic
-          CXXFLAGS=-O3 -pedantic
-
-          # Linker flags
-          LDFLAGS=-L\${OMP_LIB} -L${GCC_PATH}/lib -lomp -lgfortran -lm -isysroot ${SDK_PATH}
-          CPPFLAGS += -I$(brew --prefix gettext)/include
-          LDFLAGS  += -L$(brew --prefix gettext)/lib -lintl
-
-
-          # Fortran configuration
-          FC=$(brew --prefix gfortran)/bin/gfortran
-          F77=$(brew --prefix gfortran)/bin/gfortran
-          FLIBS=-L$(brew --prefix gfortran)/lib -lgfortran -lquadmath
-          EOF
-
-      - name: Configure Makevars (macOS-clang)
-        if: runner.os == 'macOS' && matrix.config.compiler == 'clang'
-        run: |
-          mkdir -p ~/.R
-          GCC_PATH=$(brew --prefix gcc)
-          SDK_PATH=$(xcrun --show-sdk-path)
-
-          GCC_BIN=gcc-14
-          GXX_BIN=g++-14
-
-          cat << EOF > ~/.R/Makevars
-          # Compiler settings
-          CC=${GCC_PATH}/bin/${GCC_BIN}
-          CXX=${GCC_PATH}/bin/${GXX_BIN}
-          CXX11=${GCC_PATH}/bin/${GXX_BIN}
-          CXX14=${GCC_PATH}/bin/${GXX_BIN}
-          CXX17=${GCC_PATH}/bin/${GXX_BIN}
-          CXX20=${GCC_PATH}/bin/${GXX_BIN}
-
-          # Compiler flags
-          CPPFLAGS=-isysroot ${SDK_PATH}
-          CFLAGS=-O3 -pedantic
-          CXXFLAGS=-O3 -pedantic
-
-          # Linker flags
-          LDFLAGS=-L${GCC_PATH}/lib -lgfortran -lm -isysroot ${SDK_PATH}
-          CPPFLAGS += -I$(brew --prefix gettext)/include
-          LDFLAGS  += -L$(brew --prefix gettext)/lib -lintl
-
-          # Fortran configuration
-          FC=$(brew --prefix gfortran)/bin/gfortran
-          F77=$(brew --prefix gfortran)/bin/gfortran
-          FLIBS=-L$(brew --prefix gfortran)/lib -lgfortran -lquadmath
-          EOF
-
-      - name: Setup R
-        uses: r-lib/actions/setup-r@v2
-        with:
-          r-version: ${{ matrix.config.r }}
-          http-user-agent: ${{ matrix.config.http-user-agent || '' }}
-          use-public-rspm: true
-
-      - name: Installing {pkgs}
-        uses: r-lib/actions/setup-r-dependencies@v2
-        with:
-          extra-packages: any::rcmdcheck reticulate
-          needs: check
-
-      - name: Check R build-tools
-        shell: Rscript {0}
-        run: |
-          pkgbuild::check_build_tools(debug = TRUE)
-
-      - name: Check OpenMP availability
-        if: matrix.config.compiler != 'clang'
-        shell: Rscript {0}
-        run: |
-          # 1) check if OpenMP
-          # is available
-          Rcpp::cppFunction(plugins = "openmp",
-            code = "
-            bool is_available() {
-              #ifdef _OPENMP
-                return true;
-              #else
-                return false;
-              #endif
-            }
-            "
-          )
-
-          # 2) stop if not
-          # available
-          stopifnot(
-            "OpenMP not available!" = is_available()
-          )
-
-      - name: Setup Python and {reticulate}
-        uses: ./.github/actions/setup-reticulate
-
-      - name: R CMD check
-        uses: r-lib/actions/check-r-package@v2
-        with:
-          build_args: 'c("--no-manual", "--compact-vignettes=gs+qpdf")'
-          upload-snapshots: true
+    R-CMD-check:
+        runs-on: ${{ matrix.config.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                config:
+                    # Ubuntu
+                    - {os: ubuntu-latest,   r: 'devel',     compiler: 'default', http-user-agent: 'release'}
+                    - {os: ubuntu-latest,   r: 'release',   compiler: 'default'}
+                    - {os: ubuntu-latest,   r: 'oldrel-1',  compiler: 'default'}
+                    - {os: ubuntu-latest,   r: 'oldrel-2',  compiler: 'default'}
+                    - {os: ubuntu-latest,   r: 'oldrel-3',  compiler: 'default'}
+
+                    # Windows
+                    - {os: windows-latest,  r: 'devel',     compiler: 'default'}
+                    - {os: windows-latest,  r: 'release',   compiler: 'default'}
+                    - {os: windows-latest,  r: 'oldrel-1',  compiler: 'default'}
+
+
+                    # macOS Clang
+                    - {os: macos-latest,    r: 'devel',     compiler: 'clang'}
+                    - {os: macos-latest,    r: 'release',   compiler: 'clang'}
+                    - {os: macos-latest,    r: 'oldrel-1',  compiler: 'clang'}
+
+                    # macOS GCC via Homebrew
+                    - {os: macos-latest,    r: 'devel',     compiler: 'gcc'}
+                    - {os: macos-latest,    r: 'release',   compiler: 'gcc'}
+                    - {os: macos-latest,    r: 'oldrel-1',  compiler: 'gcc'}
+
+        env:
+            GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+            R_KEEP_PKG_SOURCE: yes
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Setup pandoc
+              uses: r-lib/actions/setup-pandoc@v2
+
+            - name: Install and update build tools (macOS)
+              if: runner.os == 'macOS'
+              run: |
+                # update and upgrade
+                # everything brew-related
+                brew update
+                brew upgrade
+
+                # reinstall important
+                # libraries
+                brew reinstall gcc
+                brew reinstall pkg-config
+                brew reinstall gettext
+                brew install libomp
+
+                # clean up eveything
+                brew cleanup
+
+                # creatre folders
+                # and symbolic links
+                sudo mkdir -p /opt/R/arm64/lib
+                sudo ln -sf $(brew --prefix gettext)/lib/libintl.a /opt/R/arm64/lib/libintl.a
+
+            - name: Setup R
+              uses: r-lib/actions/setup-r@v2
+              with:
+                r-version: ${{ matrix.config.r }}
+                http-user-agent: ${{ matrix.config.http-user-agent || '' }}
+                use-public-rspm: true
+
+            - name: Installing {pkgs}
+              uses: r-lib/actions/setup-r-dependencies@v2
+              with:
+                extra-packages: any::rcmdcheck reticulate
+                needs: check
+
+            - name: Check R build-tools
+              shell: Rscript {0}
+              run: |
+                pkgbuild::check_build_tools(debug = TRUE)
+
+            - name: Setup Python and {reticulate}
+              uses: ./.github/actions/setup-reticulate
+
+            - name: R CMD check
+              uses: r-lib/actions/check-r-package@v2
+              with:
+                build_args: 'c("--no-manual", "--compact-vignettes=gs+qpdf")'
+                upload-snapshots: true
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,15 @@ inst/doc
 cran_comments.md
 cran-comments.md
 /.quarto/
+
+# ignore configure
+# artefacts
+autom4te.cache
+config.log
+config.status
+configure~
+
+# ignore makevars
+# this is autogenerated on 
+# build
+src/Makevars
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,6 +12,7 @@ Authors@R: c(
   )
 Description:
   Performance evaluation metrics for supervised and unsupervised machine learning, statistical learning and artificial intelligence applications. Core computations are implemented in 'C++' for scalability and efficiency.
+SystemRequirements: C++17
 License: GPL (>= 3)
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
@@ -30,7 +31,7 @@ Imports:
     lattice,
     Rcpp
 Depends: 
-    R (>= 4.3)
+    R (>= 4.0.0)
 URL: https://serkor1.github.io/SLmetrics/, https://github.com/serkor1/SLmetrics
 BugReports: https://github.com/serkor1/SLmetrics/issues
 LazyData: true

diff --git a/R/RcppExports.R b/R/RcppExports.R
@@ -26,21 +26,21 @@ accuracy.cmatrix <- function(x, ...) {
 #' @method baccuracy factor
 #' @export
 baccuracy.factor <- function(actual, predicted, adjust = FALSE, na.rm = TRUE, ...) {
-    .Call(`_SLmetrics_BalancedAccuracy`, actual, predicted, adjust, na_rm = na.rm)
+    .Call(`_SLmetrics_balanced_accuracy`, actual, predicted, adjust, na_rm = na.rm)
 }
 
 #' @rdname baccuracy
 #' @method weighted.baccuracy factor
 #' @export
 weighted.baccuracy.factor <- function(actual, predicted, w, adjust = FALSE, na.rm = TRUE, ...) {
-    .Call(`_SLmetrics_weighted_BalancedAccuracy`, actual, predicted, w, adjust, na_rm = na.rm)
+    .Call(`_SLmetrics_weighted_balanced_accuracy`, actual, predicted, w, adjust, na_rm = na.rm)
 }
 
 #' @rdname baccuracy
 #' @method baccuracy cmatrix
 #' @export
 baccuracy.cmatrix <- function(x, adjust = FALSE, na.rm = TRUE, ...) {
-    .Call(`_SLmetrics_cmatrix_BalancedAccuracy`, x, adjust, na_rm = na.rm)
+    .Call(`_SLmetrics_cmatrix_balanced_accuracy`, x, adjust, na_rm = na.rm)
 }
 
 #' @rdname ckappa
@@ -68,14 +68,14 @@ ckappa.cmatrix <- function(x, beta = 0.0, ...) {
 #' @method cmatrix factor
 #' @export
 cmatrix.factor <- function(actual, predicted, ...) {
-    .Call(`_SLmetrics_UnweightedConfusionMatrix`, actual, predicted)
+    .Call(`_SLmetrics_confusion_matrix`, actual, predicted)
 }
 
 #' @rdname cmatrix
 #' @method weighted.cmatrix factor
 #' @export
 weighted.cmatrix.factor <- function(actual, predicted, w, ...) {
-    .Call(`_SLmetrics_WeightedConfusionMatrix`, actual, predicted, w)
+    .Call(`_SLmetrics_weighted_confusion_matrix`, actual, predicted, w)
 }
 
 #' @rdname dor

diff --git a/cleanup b/cleanup
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -f config.*
+rm -f src/Makevars
+rm -rf autom4te.cache
diff --git a/cleanup.win b/cleanup.win
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+rm -f config.*
+rm -f src/Makevars.win
+rm -f test_cpp_version.cpp
+rm -f test_cpp_version.exe
+rm -rf autom4te.cache