From 276fb1a4760301b81fef632587360a50156badec Mon Sep 17 00:00:00 2001 From: katieb1 Date: Fri, 1 Dec 2023 10:57:09 -0800 Subject: [PATCH 1/3] Fix folder class when dependencies in library structure --- R/folderId.R | 3 ++- R/internalHelpers.R | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/R/folderId.R b/R/folderId.R index 440a50cd..ead04598 100644 --- a/R/folderId.R +++ b/R/folderId.R @@ -52,7 +52,8 @@ setMethod("folderId", signature(ssimObject = "Folder"), function(ssimObject) { }) #' @rdname folderId setMethod("folderId", signature(ssimObject = "Scenario"), function(ssimObject) { - parentFolderId <- getParentFolderId(ssimObject, ssimObject@scenarioId) + parentFolderId <- getParentFolderId(ssimObject, ssimObject@scenarioId, + item="Scenario") folderInfo <- getFolderData(ssimObject) if (!parentFolderId %in% folderInfo$FolderID){ parentFolderId <- NA diff --git a/R/internalHelpers.R b/R/internalHelpers.R index ed4b8070..0f6987fd 100644 --- a/R/internalHelpers.R +++ b/R/internalHelpers.R @@ -335,10 +335,11 @@ getFolderData <- function(x) { # # @param x SyncroSim Library, Project, Scenario, or Folder object. # @param folderId integer value of the child Folder ID. +# @param item string indicating type of the child item ("Folder" or "Scenario") # @return integer corresponding to the parent folder ID or project ID. -getParentFolderId <- function(x, id) { +getParentFolderId <- function(x, id, item="Folder") { df <- getLibraryStructure(x) - childRowInd <- which((df$id == id) & (df$item != "Project")) + childRowInd <- which((df$id == id) & (df$item == item)) parentRowInd <- childRowInd - 1 childRow <- df[childRowInd, ] childLevel <- as.numeric(childRow$level) @@ -434,6 +435,7 @@ getLibraryStructure <- function(x) { i = i + 1 } + libStructureDF <- libStructureDF[!is.na(libStructureDF$item),] return(libStructureDF) } From 15496d518f2727277c33ed6d65503e888f2edaab Mon Sep 17 00:00:00 2001 From: katieb1 Date: Fri, 1 Dec 2023 11:28:05 -0800 Subject: [PATCH 2/3] Increment version --- DESCRIPTION | 2 +- NEWS.md | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 214d782f..2ae7d109 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: rsyncrosim Type: Package Title: The R Interface to 'SyncroSim' -Version: 1.4.13 +Version: 1.4.14 Authors@R: c( person("Colin", "Daniel", email = "colin.daniel@apexrms.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 8f2686a1..c8bdde43 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,12 +1,11 @@ -# rsyncrosim 1.4.13 +# rsyncrosim 1.4.14 ## Breaking changes - ## Bug fixes: -* Fixed bug introduced in 1.4.12 in `saveDatasheet()` function failing to save project and library scoped datasheets, and when the `fileData` argument was used. +* Fixed bug in `folder()` function - issue retrieving existing folder when dependencies added to the library structure ## New features: From c652640bab0fcdd7316032731e29331e6439e8e9 Mon Sep 17 00:00:00 2001 From: katieb1 Date: Wed, 3 Jan 2024 09:54:18 -0800 Subject: [PATCH 3/3] Update copyright to 2024 --- LICENSE | 2 +- R/AAAClassDefinitions.R | 2 +- R/addPackage.R | 2 +- R/addRow.R | 2 +- R/addon.R | 2 +- R/autogentags.R | 2 +- R/backup.R | 2 +- R/breakpoint.R | 2 +- R/command.R | 2 +- R/condaFilepath.R | 2 +- R/datasheet.R | 2 +- R/datasheetRaster.R | 2 +- R/datasheetSpatRaster.R | 2 +- R/dateModified.R | 2 +- R/delete.R | 2 +- R/dependency.R | 2 +- R/description.R | 2 +- R/disableAddon.R | 2 +- R/enableAddon.R | 2 +- R/filepath.R | 2 +- R/folder.R | 2 +- R/folderId.R | 2 +- R/ignoreDependencies.R | 2 +- R/installConda.R | 2 +- R/internalHelpers.R | 2 +- R/internalWrappers.R | 2 +- R/mergeDependencies.R | 2 +- R/name.R | 2 +- R/owner.R | 2 +- R/package.R | 2 +- R/parentId.R | 2 +- R/print.R | 2 +- R/printCmd.R | 2 +- R/project.R | 2 +- R/projectId.R | 2 +- R/published.R | 2 +- R/readOnly.R | 2 +- R/removePackage.R | 2 +- R/rsyncrosim.R | 2 +- R/run.R | 2 +- R/runLog.R | 2 +- R/saveDatasheet.R | 2 +- R/scenario.R | 2 +- R/scenarioId.R | 2 +- R/session.R | 2 +- R/silent.R | 2 +- R/sqlStatement.R | 2 +- R/ssimEnvironment.R | 2 +- R/ssimLibrary.R | 2 +- R/ssimUpdate.R | 2 +- R/updatePackage.R | 2 +- R/useConda.R | 2 +- R/version.R | 2 +- tests/testthat/test-integration.R | 2 +- tests/testthat/test-unit.R | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/LICENSE b/LICENSE index 99d48e3c..e9694b91 100644 --- a/LICENSE +++ b/LICENSE @@ -1,2 +1,2 @@ -YEAR: 2016-2023 +YEAR: 2016-2024 COPYRIGHT HOLDER: Apex Resource Management Solutions Ltd. \ No newline at end of file diff --git a/R/AAAClassDefinitions.R b/R/AAAClassDefinitions.R index 2db9ff24..30e37485 100644 --- a/R/AAAClassDefinitions.R +++ b/R/AAAClassDefinitions.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License setClassUnion("missingOrNULL", c("missing", "NULL")) diff --git a/R/addPackage.R b/R/addPackage.R index 18ab8d69..9415f6a7 100644 --- a/R/addPackage.R +++ b/R/addPackage.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/addRow.R b/R/addRow.R index 55188db0..f1071c73 100644 --- a/R/addRow.R +++ b/R/addRow.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/addon.R b/R/addon.R index 95233a48..1c7431d0 100644 --- a/R/addon.R +++ b/R/addon.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/autogentags.R b/R/autogentags.R index dca32218..eb2b11ac 100644 --- a/R/autogentags.R +++ b/R/autogentags.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/backup.R b/R/backup.R index 78ebc4b5..1ad39ff3 100644 --- a/R/backup.R +++ b/R/backup.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/breakpoint.R b/R/breakpoint.R index 1a59087f..8cf404c1 100644 --- a/R/breakpoint.R +++ b/R/breakpoint.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/command.R b/R/command.R index 41e03090..862003e9 100644 --- a/R/command.R +++ b/R/command.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/condaFilepath.R b/R/condaFilepath.R index d808ebd5..b320bc6a 100644 --- a/R/condaFilepath.R +++ b/R/condaFilepath.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/datasheet.R b/R/datasheet.R index c1e2dad1..11b7a5c3 100644 --- a/R/datasheet.R +++ b/R/datasheet.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/datasheetRaster.R b/R/datasheetRaster.R index 36b426ef..bdff1b7b 100644 --- a/R/datasheetRaster.R +++ b/R/datasheetRaster.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/datasheetSpatRaster.R b/R/datasheetSpatRaster.R index ad85c1a8..d0a3fbcd 100644 --- a/R/datasheetSpatRaster.R +++ b/R/datasheetSpatRaster.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/dateModified.R b/R/dateModified.R index e7a1cb9e..c753fa83 100644 --- a/R/dateModified.R +++ b/R/dateModified.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/delete.R b/R/delete.R index b33190df..0a963760 100644 --- a/R/delete.R +++ b/R/delete.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/dependency.R b/R/dependency.R index d286edfc..5a7b1ce2 100644 --- a/R/dependency.R +++ b/R/dependency.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/description.R b/R/description.R index e8f11296..bdff8045 100644 --- a/R/description.R +++ b/R/description.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/disableAddon.R b/R/disableAddon.R index d240a2ab..31637ae2 100644 --- a/R/disableAddon.R +++ b/R/disableAddon.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/enableAddon.R b/R/enableAddon.R index e97ab66f..0360029d 100644 --- a/R/enableAddon.R +++ b/R/enableAddon.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/filepath.R b/R/filepath.R index 8c80a037..16ced013 100644 --- a/R/filepath.R +++ b/R/filepath.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/folder.R b/R/folder.R index 8711e274..bcd87f9d 100644 --- a/R/folder.R +++ b/R/folder.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/folderId.R b/R/folderId.R index ead04598..5925d6ce 100644 --- a/R/folderId.R +++ b/R/folderId.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/ignoreDependencies.R b/R/ignoreDependencies.R index df897f20..782b639b 100644 --- a/R/ignoreDependencies.R +++ b/R/ignoreDependencies.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/installConda.R b/R/installConda.R index 4c058487..e81fa456 100644 --- a/R/installConda.R +++ b/R/installConda.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/internalHelpers.R b/R/internalHelpers.R index 0f6987fd..0b2e3404 100644 --- a/R/internalHelpers.R +++ b/R/internalHelpers.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/internalWrappers.R b/R/internalWrappers.R index ecddb13a..4b5ba435 100644 --- a/R/internalWrappers.R +++ b/R/internalWrappers.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/mergeDependencies.R b/R/mergeDependencies.R index 61f3e7dd..982c536e 100644 --- a/R/mergeDependencies.R +++ b/R/mergeDependencies.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/name.R b/R/name.R index 7d21cf0d..311957b2 100644 --- a/R/name.R +++ b/R/name.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/owner.R b/R/owner.R index 4a96f9a2..2fc025f0 100644 --- a/R/owner.R +++ b/R/owner.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/package.R b/R/package.R index 3e4b6988..0274c96c 100644 --- a/R/package.R +++ b/R/package.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/parentId.R b/R/parentId.R index 37436ff7..50ea8485 100644 --- a/R/parentId.R +++ b/R/parentId.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/print.R b/R/print.R index dfaf263f..298e44ed 100644 --- a/R/print.R +++ b/R/print.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/printCmd.R b/R/printCmd.R index 93ba6080..7443249d 100644 --- a/R/printCmd.R +++ b/R/printCmd.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/project.R b/R/project.R index 7987dff6..608a3bec 100644 --- a/R/project.R +++ b/R/project.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/projectId.R b/R/projectId.R index 10d92f7b..56ad7731 100644 --- a/R/projectId.R +++ b/R/projectId.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/published.R b/R/published.R index 785a3c6f..8ce7ea21 100644 --- a/R/published.R +++ b/R/published.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/readOnly.R b/R/readOnly.R index f41ced9f..55f699af 100644 --- a/R/readOnly.R +++ b/R/readOnly.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/removePackage.R b/R/removePackage.R index a744e715..003086f0 100644 --- a/R/removePackage.R +++ b/R/removePackage.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/rsyncrosim.R b/R/rsyncrosim.R index c9044c7f..ad0e479c 100644 --- a/R/rsyncrosim.R +++ b/R/rsyncrosim.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' rsyncrosim: The R interface to SyncroSim: https://syncrosim.com/ diff --git a/R/run.R b/R/run.R index 7a525166..ca8540e8 100644 --- a/R/run.R +++ b/R/run.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/runLog.R b/R/runLog.R index 8f10d8d6..4f9b5e17 100644 --- a/R/runLog.R +++ b/R/runLog.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/saveDatasheet.R b/R/saveDatasheet.R index cf02c414..b6338e33 100644 --- a/R/saveDatasheet.R +++ b/R/saveDatasheet.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/scenario.R b/R/scenario.R index af78598b..c1e7c4d4 100644 --- a/R/scenario.R +++ b/R/scenario.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/scenarioId.R b/R/scenarioId.R index c5a7ccd9..0b8d82f7 100644 --- a/R/scenarioId.R +++ b/R/scenarioId.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/session.R b/R/session.R index 1e81c941..bef6f992 100644 --- a/R/session.R +++ b/R/session.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/silent.R b/R/silent.R index 4d7ce31b..31fa88ee 100644 --- a/R/silent.R +++ b/R/silent.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/sqlStatement.R b/R/sqlStatement.R index c618b721..42fb4bd0 100644 --- a/R/sqlStatement.R +++ b/R/sqlStatement.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/ssimEnvironment.R b/R/ssimEnvironment.R index db8a7997..475a4234 100644 --- a/R/ssimEnvironment.R +++ b/R/ssimEnvironment.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' SyncroSim Environment diff --git a/R/ssimLibrary.R b/R/ssimLibrary.R index 0e3f1cf5..b83f5c3d 100644 --- a/R/ssimLibrary.R +++ b/R/ssimLibrary.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/ssimUpdate.R b/R/ssimUpdate.R index 4eb67888..9066aeca 100644 --- a/R/ssimUpdate.R +++ b/R/ssimUpdate.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/updatePackage.R b/R/updatePackage.R index e2c3b5a0..c552620f 100644 --- a/R/updatePackage.R +++ b/R/updatePackage.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/useConda.R b/R/useConda.R index e508d326..52d255c5 100644 --- a/R/useConda.R +++ b/R/useConda.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/R/version.R b/R/version.R index 4da56286..65c77366 100644 --- a/R/version.R +++ b/R/version.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License #' @include AAAClassDefinitions.R NULL diff --git a/tests/testthat/test-integration.R b/tests/testthat/test-integration.R index 4f592b4d..572bcf49 100644 --- a/tests/testthat/test-integration.R +++ b/tests/testthat/test-integration.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License old_dir <- getwd() diff --git a/tests/testthat/test-unit.R b/tests/testthat/test-unit.R index 24f9a2b2..5cd7f59d 100644 --- a/tests/testthat/test-unit.R +++ b/tests/testthat/test-unit.R @@ -1,4 +1,4 @@ -# Copyright (c) 2023 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. +# Copyright (c) 2024 Apex Resource Management Solution Ltd. (ApexRMS). All rights reserved. # MIT License ## lines 41, 175, 226 fail in test env. old_dir <- getwd()