From 7398c1fbf94887c8fafeedd50a18ff632ede0de3 Mon Sep 17 00:00:00 2001
From: Sebastian Jentschke <Sebastian.Jentschke@gmail.com>
Date: Sun, 10 Nov 2024 21:31:50 +0100
Subject: [PATCH] Create binDst which can be called as function (also from
 jTransform)

---
 R/distances_omv.R | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/R/distances_omv.R b/R/distances_omv.R
index 76b84a7..769232c 100644
--- a/R/distances_omv.R
+++ b/R/distances_omv.R
@@ -231,8 +231,7 @@ distances_omv <- function(dtaInp = NULL, fleOut = "", varDst = c(), clmDst = TRU
     } else if (grepl("^chisq$|^ph2$",       nmeDst)) {
         dstMtx <- clcFrq(dtaMtx, nmeDst)
     # (3) binary data -----------------------------------------------------------------------------
-    } else if (grepl(paste0("^beuclid|^blwmn|^bseuclid|^bshape|^d$|^d_|^dice|^disper|^hamann|^jaccard|^k[1-2]$|^k[1-2]_|",
-                            "^lambda|^ochiai|^pattern|^phi|^q$|^q_|^rr|^rt|^size|^ss[1-5]|^sm|^y$|^y_|^variance"), nmeDst)) {
+    } else if (binDst(nmeDst)) {
         dstMtx <- clcBin(dtaMtx, nmeDst)
     # (4) none ------------------------------------------------------------------------------------
     } else if (grepl("^none$",              nmeDst)) {
@@ -251,6 +250,12 @@ distances_omv <- function(dtaInp = NULL, fleOut = "", varDst = c(), clmDst = TRU
 }
 
 # helper and calculation functions ================================================================
+# binary measures: check whether name is valid
+binDst <- function(nmeDst = "") {
+    grepl(paste0("^beuclid$|^blwmn$|^bseuclid$|^bshape$|^d$|^dice$|^disper$|^hamann$|^jaccard$|^jaccard[s,d]$|^k[1-2]$|^lambda$|",
+                 "^ochiai$|^pattern$|^phi$|^q$|^rr$|^rt$|^size$|^sm$|^ss[1-5]$|^variance$|^y$"), gsub("_\\d+_\\d+$", "", nmeDst))
+}
+
 # binary measures: calculation, calls mtcBin for each cell (variable pair comparison / matches)
 clcBin <- function(m = NULL, t = "jaccard") {
     # transform data matrix into a logical matrix