Skip to content

Commit 4e4c94c

Browse files
committed
hmcdm 2.1.2
1 parent 97b6fc6 commit 4e4c94c

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: hmcdm
22
Type: Package
33
Title: Hidden Markov Cognitive Diagnosis Models for Learning
4-
Version: 2.1.1
4+
Version: 2.1.2
55
Authors@R: c(
66
person("Susu", "Zhang", email = "szhan105@illinois.edu", role = c("aut")),
77
person("Shiyu", "Wang", email = "swang44@uga.edu", role = c("aut")),

NEWS.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# hmcdm 2.1.2
2+
3+
- Release of `hmcdm` package version 2.1.2.
4+
5+
- Resolved compilation warnings on CRAN by replacing the deprecated `arma::conv_to<double>::from()` with `arma::as_scalar()`. This addresses an issue introduced by a recent `RcppArmadillo` update and ensures forward compatibility with the latest version of Armadillo.
6+
17
# hmcdm 2.1.0
28

39
- Release of `hmcdm` package version 2.1.0.

src/basic_functions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ arma::mat ETAmat(unsigned int K,unsigned int J,const arma::mat& Q) {
175175
arma::vec alpha_c = inv_bijectionvector(K,cc);
176176
for(unsigned int j=0;j<J;j++){ //*
177177
arma::rowvec qj = Q.row(j);
178-
double compare = arma::conv_to<double>::from(qj*alpha_c - qj*qj.t());
178+
double compare = arma::as_scalar(qj*alpha_c - qj*qj.t());
179179
ETA(j,cc) = (compare>=0);
180180
}
181181
}

src/mcmc_functions.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1456,10 +1456,10 @@ void parm_update_rRUM_g(const arma::cube& Design_array,
14561456
for(unsigned int k=0;k<K;k++){
14571457
arma::vec alpha_i_1 = alpha_i;
14581458
alpha_i_1(k) = 1.0;
1459-
c_aik_1 = (arma::conv_to< double >::from( alpha_i_1.t()*bijectionvector(K) ));
1459+
c_aik_1 = (arma::as_scalar( alpha_i_1.t()*bijectionvector(K) ));
14601460
arma::vec alpha_i_0 = alpha_i;
14611461
alpha_i_0(k) = 0.0;
1462-
c_aik_0 = (arma::conv_to< double >::from( alpha_i_0.t()*bijectionvector(K) ));
1462+
c_aik_0 = (arma::as_scalar( alpha_i_0.t()*bijectionvector(K) ));
14631463
// Rcpp::Rcout<<alpha_i_1<<std::endl;
14641464
// Rcpp::Rcout<<alpha_i_0<<std::endl;
14651465

@@ -1546,9 +1546,9 @@ void parm_update_rRUM_g(const arma::cube& Design_array,
15461546
arma::vec Xjk = Xj.col(kj);
15471547
arma::vec ak = alpha.col(kj);
15481548

1549-
double Sumalphak = (arma::conv_to< double >::from(ak.t() * ak));
1550-
double SumXjk = (arma::conv_to< double >::from(Xjk.t() * Xjk));
1551-
double SumXjkalphak = (arma::conv_to< double >::from(Xjk.t() * ak));
1549+
double Sumalphak = (arma::as_scalar(ak.t() * ak));
1550+
double SumXjk = (arma::as_scalar(Xjk.t() * Xjk));
1551+
double SumXjkalphak = (arma::as_scalar(Xjk.t() * ak));
15521552
double bsk = SumXjkalphak ;
15531553
double ask = Sumalphak - SumXjkalphak ;
15541554
double agk = SumXjk - SumXjkalphak ;
@@ -1765,10 +1765,10 @@ void parm_update_NIDA_indept_g(const arma::cube& Design_array,
17651765
for(unsigned int k=0;k<K;k++){
17661766
arma::vec alpha_i_1 = alpha_i;
17671767
alpha_i_1(k) = 1.0;
1768-
c_aik_1 = (arma::conv_to< double >::from( alpha_i_1.t()*bijectionvector(K) ));
1768+
c_aik_1 = (arma::as_scalar( alpha_i_1.t()*bijectionvector(K) ));
17691769
arma::vec alpha_i_0 = alpha_i;
17701770
alpha_i_0(k) = 0.0;
1771-
c_aik_0 = (arma::conv_to< double >::from( alpha_i_0.t()*bijectionvector(K) ));
1771+
c_aik_0 = (arma::as_scalar( alpha_i_0.t()*bijectionvector(K) ));
17721772
// Rcpp::Rcout<<alpha_i_1<<std::endl;
17731773
// Rcpp::Rcout<<alpha_i_0<<std::endl;
17741774

0 commit comments

Comments
 (0)