lib/statsample/factor.rb in statsample-1.4.3 vs lib/statsample/factor.rb in statsample-1.5.0

@@ -32,25 +32,24 @@
     #   "If this matrix does not exhibit many zero off-diagonal elements,
     #   the investigator has evidence that the correlation
     #   matrix is not appropriate for factor analysis."
     # 
     def self.anti_image_covariance_matrix(matrix)
-      s2=Matrix.diag(*(matrix.inverse.diagonal)).inverse
+      s2=Matrix.diagonal(*(matrix.inverse.diagonal)).inverse
       aicm=(s2)*matrix.inverse*(s2)
       aicm.extend(Statsample::CovariateMatrix)
       aicm.fields=matrix.fields if matrix.respond_to? :fields
       aicm
     end
     def self.anti_image_correlation_matrix(matrix)
       matrix=matrix.to_matrix
-      s=Matrix.diag(*(matrix.inverse.diagonal)).sqrt.inverse
+      s=Matrix.diagonal(*(matrix.inverse.diagonal)).sqrt.inverse
       aicm=s*matrix.inverse*s
       
       aicm.extend(Statsample::CovariateMatrix)
       aicm.fields=matrix.fields if matrix.respond_to? :fields
       aicm
-      
     end
       
     # Kaiser-Meyer-Olkin measure of sampling adequacy for correlation matrix.
     # 
     # Kaiser's (1974, cited on Dziuban  & Shirkey, 1974) present calibration of the index is as follows :
@@ -99,8 +98,7 @@
           sum_q+=q[j,k]**2
         end
       end
       sum_r.quo(sum_r+sum_q)
     end
-    
   end
 end