18
18
PLSSEMInternal <- function (jaspResults , dataset , options , ... ) {
19
19
jaspResults $ addCitation(" Rademaker ME, Schuberth F (2020). cSEM: Composite-Based Structural Equation Modeling. Package version: 0.4.0, https://m-e-rademaker.github.io/cSEM/." )
20
20
21
+ sink(file = " ~/Downloads/log.txt" )
22
+ on.exit(sink(NULL ))
21
23
22
24
options <- .plsSemPrepOpts(options )
23
25
@@ -124,8 +126,9 @@ checkCSemModel <- function(model, availableVars) {
124
126
if (inherits(parsed , " try-error" )) {
125
127
126
128
msg <- attr(parsed , " condition" )$ message
129
+
127
130
if (msg == " NA/NaN argument" ) {
128
- return (" Enter a model" )
131
+ return (gettext( " Enter a model" ) )
129
132
}
130
133
return (stringr :: str_replace_all(msg , unvvars ))
131
134
}
@@ -139,12 +142,16 @@ checkCSemModel <- function(model, availableVars) {
139
142
modelVarsInAvailableVars <- (modelVars %in% vvars )
140
143
if (! all(modelVarsInAvailableVars )) {
141
144
notRecognized <- modelVars [! modelVarsInAvailableVars ]
142
- return (paste(" Variable(s) in model syntax not recogzed:" ,
143
- paste(stringr :: str_replace_all(notRecognized , unvvars ),
144
- collapse = " , " )))
145
+ return (gettextf(" Variable(s) in model syntax not recognized: %s" ,
146
+ paste(stringr :: str_replace_all(notRecognized , unvvars ), collapse = " , " )))
145
147
}
146
148
}
147
149
150
+ # check for '~~'
151
+ if (grepl(" ~~" , vmodel )) {
152
+ return (gettext(" Using '~~' is not supported. Try '~' instead" ))
153
+ }
154
+
148
155
# if checks pass, return empty string
149
156
return (" " )
150
157
}
@@ -517,7 +524,7 @@ checkCSemModel <- function(model, availableVars) {
517
524
if (! is.null(modelContainer [[" params" ]])) return ()
518
525
519
526
# create container for parameter estimates
520
- params <- createJaspContainer(gettext(" Parameter estimates " ))
527
+ params <- createJaspContainer(gettext(" Parameter Estimates " ))
521
528
params $ position <- 1
522
529
params $ dependOn(c(" models" , " ciLevel" ))
523
530
@@ -616,7 +623,7 @@ checkCSemModel <- function(model, availableVars) {
616
623
pecont [[" path" ]] <- pathTab
617
624
618
625
# create total effects table
619
- totalTab <- createJaspTable(title = gettext(" Total effects " ))
626
+ totalTab <- createJaspTable(title = gettext(" Total Effects " ))
620
627
621
628
if (options [[" group" ]] != " " )
622
629
totalTab $ addColumnInfo(name = " group" , title = gettext(" Group" ), type = " string" , combine = TRUE )
@@ -1789,7 +1796,7 @@ checkCSemModel <- function(model, availableVars) {
1789
1796
oictab [[" rownames" ]] <- rownames(oic )
1790
1797
}
1791
1798
nm <- colnames(oic )[i ]
1792
- oictab $ addColumnInfo(nm , title = nm , type = " pvalue " )
1799
+ oictab $ addColumnInfo(nm , title = nm , type = " number " )
1793
1800
oictab [[nm ]] <- oic [,i ]
1794
1801
}
1795
1802
}
@@ -1805,7 +1812,7 @@ checkCSemModel <- function(model, availableVars) {
1805
1812
iictab [[" rownames" ]] <- rownames(iic )
1806
1813
}
1807
1814
nm <- colnames(iic )[i ]
1808
- iictab $ addColumnInfo(nm , title = nm , type = " pvalue " )
1815
+ iictab $ addColumnInfo(nm , title = nm , type = " number " )
1809
1816
iictab [[nm ]] <- iic [,i ]
1810
1817
}
1811
1818
}
@@ -1821,7 +1828,7 @@ checkCSemModel <- function(model, availableVars) {
1821
1828
occtab [[" rownames" ]] <- rownames(occ )
1822
1829
}
1823
1830
nm <- colnames(occ )[i ]
1824
- occtab $ addColumnInfo(nm , title = nm , type = " pvalue " )
1831
+ occtab $ addColumnInfo(nm , title = nm , type = " number " )
1825
1832
occtab [[nm ]] <- occ [,i ]
1826
1833
}
1827
1834
}
@@ -1837,7 +1844,7 @@ checkCSemModel <- function(model, availableVars) {
1837
1844
icctab [[" rownames" ]] <- rownames(icc )
1838
1845
}
1839
1846
nm <- colnames(icc )[i ]
1840
- icctab $ addColumnInfo(nm , title = nm , type = " pvalue " )
1847
+ icctab $ addColumnInfo(nm , title = nm , type = " number " )
1841
1848
icctab [[nm ]] <- icc [,i ]
1842
1849
}
1843
1850
}
@@ -1863,7 +1870,7 @@ checkCSemModel <- function(model, availableVars) {
1863
1870
oiccont [[groupNames [i ]]][[" rownames" ]] <- rownames(oic )
1864
1871
}
1865
1872
nm <- colnames(oic )[j ]
1866
- oiccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " pvalue " )
1873
+ oiccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " number " )
1867
1874
oiccont [[groupNames [i ]]][[nm ]] <- oic [,j ]
1868
1875
}
1869
1876
}
@@ -1888,7 +1895,7 @@ checkCSemModel <- function(model, availableVars) {
1888
1895
iiccont [[groupNames [i ]]][[" rownames" ]] <- rownames(iic )
1889
1896
}
1890
1897
nm <- colnames(iic )[j ]
1891
- iiccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " pvalue " )
1898
+ iiccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " number " )
1892
1899
iiccont [[groupNames [i ]]][[nm ]] <- iic [,j ]
1893
1900
}
1894
1901
}
@@ -1911,7 +1918,7 @@ checkCSemModel <- function(model, availableVars) {
1911
1918
occcont [[groupNames [i ]]][[" rownames" ]] <- rownames(occ )
1912
1919
}
1913
1920
nm <- colnames(occ )[j ]
1914
- occcont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " pvalue " )
1921
+ occcont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " number " )
1915
1922
occcont [[groupNames [i ]]][[nm ]] <- occ [,j ]
1916
1923
}
1917
1924
}
@@ -1936,7 +1943,7 @@ checkCSemModel <- function(model, availableVars) {
1936
1943
icccont [[groupNames [i ]]][[" rownames" ]] <- rownames(icc )
1937
1944
}
1938
1945
nm <- colnames(icc )[j ]
1939
- icccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " pvalue " )
1946
+ icccont [[groupNames [i ]]]$ addColumnInfo(nm , title = nm , type = " number " )
1940
1947
icccont [[groupNames [i ]]][[nm ]] <- icc [,j ]
1941
1948
}
1942
1949
}
0 commit comments