1.2-10

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: immer
 Type: Package
 Title: Item Response Models for Multiple Ratings
-Version: 1.2-9
-Date: 2020-03-02 18:01:21
+Version: 1.2-10
+Date: 2020-08-16 17:17:13
 Author: 
     Alexander Robitzsch [aut, cre], Jan Steinfeld [aut]
 Maintainer: Alexander Robitzsch <[email protected]>

R/RcppExports.R

@@ -1,5 +1,5 @@
 ## File Name: RcppExports.R
-## File Version: 1.002009
+## File Version: 1.002010
 # Generated by using Rcpp::compileAttributes() -> do not edit by hand
 # Generator token: 10BE3573-1514-4C36-9D1C-5A225CD40393
 

R/immer_FACETS.R

@@ -1,5 +1,5 @@
 ## File Name: immer_FACETS.R
-## File Version: 0.41
+## File Version: 0.43
 
 #--- Wrapper to FACDOS (Linacre, 1999)
 immer_FACETS <- function(
@@ -294,8 +294,9 @@ immer_FACETS <- function(
   score <- try(
     lapply(fileListe$Scorefile,function(x){
       all_content=readLines(file.path(path.facets,x))
-      skip_second=all_content[-1]
-      dat <- read.csv(textConnection(skip_second), header=TRUE, stringsAsFactors=FALSE)
+      # skip_second=all_content[-1]
+      dat <- read.csv(textConnection(all_content), header=FALSE, stringsAsFactors=FALSE)
+      # colnames(dat) <- namScorefile
       return(dat)
     })
   )

R/immer_install.R

@@ -1,4 +1,6 @@
 ## File Name: immer_install.R
+## File Version: 0.14
+## File Name: immer_install.R
 ## File Version: 0.12
 
 #####################################################
@@ -20,48 +22,59 @@ Darwin=
 if(os_system == "Windows"){
   # Link for dos-version of FACETS
   link_Facets <- "http://www.winsteps.com/a/facdos.zip"
-  # wo hinein
-  destination_facets <-
-    paste0("C:\\Users\\",user,"\\Downloads\\facdos.zip")
+
+  # Facets_path <-
+  #   file.path("C:","Users",user,"Downloads")
   # win DOSbox
   # JS Verison 0.09: switched to portable Version of DosBox (no admin privileges needed)
   link_DosBox <-
     "https://download3.portableapps.com/portableapps/DOSBoxPortable/DOSBoxPortable_0.74.3.paf.exe?20190321"
   # where
   if(is.null(DosBox_path)){
     destination_dosBox <-
-      paste0("C:\\Users\\",user,"\\Downloads\\DOSBoxPortable_0.74.3.exe")
+      paste0("C:\\Users\\",user,"\\Downloads\\")
   } else {
     destination_dosBox <- 
       DosBox_path
   }
+  if (!dir.exists(file.path(destination_dosBox))) { 
+      dir.create(file.path(destination_dosBox))
+    }
+
   if(is.null(Facets_path)){
-    installpath <-
+    destination_facets <-
       paste0("C:\\Users\\",user,"\\Documents\\facets")
   } else {
-    installpath <- 
+    destination_facets <- 
       Facets_path
   }
 
-
+  if (!dir.exists(file.path(destination_facets))) { 
+    dir.create(file.path(destination_facets))
+  }
+
   # -----------------------------------------
   # download files
   error_facets <- tryCatch(
     download.file(
       url = link_Facets,
-      destfile = destination_facets,
+      destfile = file.path(destination_facets,"facdos.zip"),
       method = "internal"
     )
   )
   # JS Verison 0.09: changed method to 'auto'
   error_DosBox <- tryCatch(
     download.file(
       url = link_DosBox,
-      destfile = destination_dosBox,
+      destfile = file.path(destination_dosBox,"DOSBoxPortable.exe"),
       method = "auto",
       mode = "wb"
     )
   )
+  cat( "install the DOSbox: \n")
+  error_DosBox_install <- tryCatch(
+    shell(file.path(destination_dosBox,"DOSBoxPortable.exe"))
+  )
   # -----------------------------------------
 
   # Den Admin des Computers herausfinden: und Installation von DosBox
@@ -99,12 +112,14 @@ if(os_system == "Windows"){
           please try again or install die DosBox manually \n")
       cat(paste0("for the manual installation pleas go to: \n",link_Facets,"\n",
                  "after the download process finished we recomand to unzip the Folder and
-                 move the content to \n-->",installpath,"<--"))
+                 move the content to \n-->",destination_facets,"<--"))
     }
     if(error_facets==0){
       cat("unzip facets\n")
-      utils::unzip (destination_facets, exdir=installpath)
-      cat("move facets to ",installpath,"\n")
+      utils::unzip (file.path(destination_facets,"facdos.zip"), exdir=file.path(destination_facets,"facdos"))
+      cat("move facets to ",destination_facets,"\n")
+      # cat("remove facets.zip \n")
+      # system(paste("del",file.path(destination_facets,"facdos.zip")))
       # -----------------------------------------
     }
   } # End Windows

README.md

@@ -22,9 +22,9 @@ The CRAN version can be installed from within R using:
 utils::install.packages("immer")
 ```
 
-#### GitHub version `immer` 1.2-9 (2020-03-02)
+#### GitHub version `immer` 1.2-10 (2020-08-16)
 
-[![](https://img.shields.io/badge/github%20version-1.2--9-orange.svg)](https://github.com/alexanderrobitzsch/immer)  
+[![](https://img.shields.io/badge/github%20version-1.2--10-orange.svg)](https://github.com/alexanderrobitzsch/immer)  
 
 The version hosted [here](https://github.com/alexanderrobitzsch/immer) is the development version of `immer`. 
 The GitHub version can be installed using `devtools` as:

docs/bootstrap-toc.css

@@ -0,0 +1,60 @@
+/*!
+ * Bootstrap Table of Contents v0.4.1 (http://afeld.github.io/bootstrap-toc/)
+ * Copyright 2015 Aidan Feldman
+ * Licensed under MIT (https://github.com/afeld/bootstrap-toc/blob/gh-pages/LICENSE.md) */
+
+/* modified from https://github.com/twbs/bootstrap/blob/94b4076dd2efba9af71f0b18d4ee4b163aa9e0dd/docs/assets/css/src/docs.css#L548-L601 */
+
+/* All levels of nav */
+nav[data-toggle='toc'] .nav > li > a {
+  display: block;
+  padding: 4px 20px;
+  font-size: 13px;
+  font-weight: 500;
+  color: #767676;
+}
+nav[data-toggle='toc'] .nav > li > a:hover,
+nav[data-toggle='toc'] .nav > li > a:focus {
+  padding-left: 19px;
+  color: #563d7c;
+  text-decoration: none;
+  background-color: transparent;
+  border-left: 1px solid #563d7c;
+}
+nav[data-toggle='toc'] .nav > .active > a,
+nav[data-toggle='toc'] .nav > .active:hover > a,
+nav[data-toggle='toc'] .nav > .active:focus > a {
+  padding-left: 18px;
+  font-weight: bold;
+  color: #563d7c;
+  background-color: transparent;
+  border-left: 2px solid #563d7c;
+}
+
+/* Nav: second level (shown on .active) */
+nav[data-toggle='toc'] .nav .nav {
+  display: none; /* Hide by default, but at >768px, show it */
+  padding-bottom: 10px;
+}
+nav[data-toggle='toc'] .nav .nav > li > a {
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-left: 30px;
+  font-size: 12px;
+  font-weight: normal;
+}
+nav[data-toggle='toc'] .nav .nav > li > a:hover,
+nav[data-toggle='toc'] .nav .nav > li > a:focus {
+  padding-left: 29px;
+}
+nav[data-toggle='toc'] .nav .nav > .active > a,
+nav[data-toggle='toc'] .nav .nav > .active:hover > a,
+nav[data-toggle='toc'] .nav .nav > .active:focus > a {
+  padding-left: 28px;
+  font-weight: 500;
+}
+
+/* from https://github.com/twbs/bootstrap/blob/e38f066d8c203c3e032da0ff23cd2d6098ee2dd6/docs/assets/css/src/docs.css#L631-L634 */
+nav[data-toggle='toc'] .nav > .active > ul {
+  display: block;
+}