Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: simTool
Type: Package
Title: Conduct Simulation Studies with a Minimal Amount of Source Code
Version: 1.1.7.9000
Version: 1.1.8.9000
Authors@R: person("Marsel", "Scheer", role = c("aut", "cre"), email = "scheer@freescience.de")
Maintainer: Marsel Scheer <scheer@freescience.de>
Description: Tool for statistical simulations that have two components.
Expand Down Expand Up @@ -35,5 +35,5 @@ Suggests:
License: GPL-3
VignetteBuilder: knitr
RoxygenNote: 7.3.2
URL: http://MarselScheer.github.io/simTool
URL: https://marselscheer.github.io/simTool/
BugReports: https://github.com/MarselScheer/simTool/issues
7 changes: 6 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@

Version 1.1.7.9000
Version 1.1.8.9000
=========================

* placeholder for next development-cycle

Version 1.1.8
=========================

* Upcoming R-version does not allow to apply attr() to primitives to assign values. Fix this by decorating primitives if they are used.
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ knitr::opts_chunk$set(


[![R build status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions)
[![Coverage Status](https://img.shields.io/codecov/c/github/MarselScheer/simTool/develop.svg)](https://codecov.io/github/MarselScheer/simTool?branch=develop)
[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool)
[![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
[![Project Status: Active – The project has reached a stable, usable
state and is being actively
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

[![R build
status](https://github.com/MarselScheer/simTool/workflows/R-CMD-check/badge.svg)](https://github.com/MarselScheer/simTool/actions)
[![Coverage
Status](https://img.shields.io/codecov/c/github/MarselScheer/simTool/develop.svg)](https://codecov.io/github/MarselScheer/simTool?branch=develop)
[![codecov](https://codecov.io/gh/MarselScheer/simTool/branch/development/graph/badge.svg?token=aCoLwwqLrB)](https://codecov.io/gh/MarselScheer/simTool)
[![lifecycle](https://img.shields.io/badge/lifecycle-stable-brightgreen.svg)](https://lifecycle.r-lib.org/articles/stages.html)
[![Project Status: Active – The project has reached a stable, usable
state and is being actively
Expand Down Expand Up @@ -65,9 +64,9 @@ using confidence levels 0.8, 0.9, 0.95 are applied. This is repeated
#> Number of data generating functions: 4
#> Number of analyzing procedures: 3
#> Number of replications: 1000
#> Estimated replications per hour: 1318457
#> Start of the simulation: 2025-04-05 05:37:59.800157
#> End of the simulation: 2025-04-05 05:38:02.530619
#> Estimated replications per hour: 1329200
#> Start of the simulation: 2025-04-10 18:09:19.481191
#> End of the simulation: 2025-04-10 18:09:22.189585

## Installation

Expand Down
2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ start-docker: .env

shell-docker:
@echo -------------------- $@ $$(date) --------------------
sudo docker exec -it ide /bin/sh -c "/bin/bash && su -l rstudio" || { exit 1; }
sudo docker exec -u rstudio -it ide /bin/sh -c "/bin/bash" || { exit 1; }
echo
echo "Docker container is running..."

Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- 8787:8787
ollama:
container_name: ollama
image: ollama/ollama:0.5.7
image: ollama/ollama:0.6.4
ports:
- 11434:11434
volumes:
Expand Down