From 74399f2a2730b54d4e9da8bdf9a3140a90931370 Mon Sep 17 00:00:00 2001 From: Mehmet Suzen Date: Sun, 10 Apr 2022 11:23:56 +0200 Subject: [PATCH] fixing Kurt Hornik's catch on comb function import --- DESCRIPTION | 4 ++-- NAMESPACE | 1 + buildPackage.bash | 32 -------------------------------- updateMan.bash | 7 ------- 4 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 buildPackage.bash delete mode 100644 updateMan.bash diff --git a/DESCRIPTION b/DESCRIPTION index a8ee2a1..4b7ec61 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: R1magic Type: Package Title: Compressive Sampling: Sparse Signal Recovery Utilities -Version: 0.3.2 -Date: 2015-04-19 +Version: 0.3.3 +Date: 2022-04-20 Authors@R: c( person("Mehmet", "Suzen", email = "mehmet.suzen@physics.org", role = c("aut", "cre"))) diff --git a/NAMESPACE b/NAMESPACE index 08069fe..31c78f8 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,3 +8,4 @@ exportPattern(".") import( stats ) +importFrom("utils", "combn") diff --git a/buildPackage.bash b/buildPackage.bash deleted file mode 100644 index c449c63..0000000 --- a/buildPackage.bash +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# msuzen -# April.2015 GPLv3 -# Parameters -PACKAGE_NAME=R1magic -VERSION=_0.3.2 -BUILD_DIR=build_tmp -Rexe=R -Rscr=Rscript -TAR=tar -GIT=git -# -rm -rf $BUILD_DIR -$GIT archive master | bzip2 > $PACKAGE_NAME.tar.bz2 -mkdir $BUILD_DIR -mkdir build_tmp/$PACKAGE_NAME -mv $PACKAGE_NAME.tar.bz2 build_tmp/$PACKAGE_NAME -cd build_tmp/$PACKAGE_NAME -$TAR xfj $PACKAGE_NAME.tar.bz2 -rm -rf $PACKAGE_NAME.tar.bz2 -cd .. -rm $PACKAGE_NAME/*.bash -$Rexe CMD build $PACKAGE_NAME -rm -rf $PACKAGE_NAME -tar xfz $PACKAGE_NAME$VERSION.tar.gz -cd $PACKAGE_NAME -rm -rf man/objectiveL*Rd -rm -rf man/R1*Rd -$Rscr -e "library(roxygen2); roxygen2::roxygenise()" -cp man/objective*Rd ../../../man -cd .. -$Rexe CMD check $PACKAGE_NAME --as-cran diff --git a/updateMan.bash b/updateMan.bash deleted file mode 100644 index cf04d42..0000000 --- a/updateMan.bash +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# msuzen -# April.2015 GPLv3 -# Parameters -Rscr=Rscript -# -$Rscr -e "library(roxygen2); roxygen2::roxygenise()"