@@ -117,8 +117,18 @@ clusterByQuality <- function(hmms, G=1:9, itmax=c(100,100), measures=c('spikynes

 	df <- stats::na.omit(df)

 	fit <- mclust::Mclust(df, G=G, control=emControl(itmax=itmax))

 	stopTimedMessage(ptm)

-	params <- t(fit$parameters$mean)

-	classification <- split(names(fit$classification), fit$classification)

+	params <- fit$parameters$mean

+	if (is.null(dim(params))) {

+		params <- as.matrix(params)

+		colnames(params) <- measures

+	} else {

+		params <- t(params)

+	}

+	if (is.null(names(fit$classification))) {

+		classification <- list(names(hmms))

+	} else {

+		classification <- split(names(fit$classification), fit$classification)

+	}

 	## Reorder clusters

 	if (orderBy %in% measures) {

 		index <- order(params[,orderBy], decreasing=reverseOrder)

@@ -20,7 +20,7 @@ void R_univariate_hmm(int* O, int* T, int* N, int* state_labels, double* size, d

 //  	FILELog::ReportingLevel() = FILELog::FromString("DEBUG2");

 // 	// Parallelization settings

-	omp_set_num_threads(*num_threads);

+// 	omp_set_num_threads(*num_threads);

 	// Print some information

 	//FILE_LOG(logINFO) << "number of states = " << *N;

@@ -227,7 +227,7 @@ void R_multivariate_hmm(double* D, int* T, int* N, int *Nmod, int* comb_states,

 //  	FILELog::ReportingLevel() = FILELog::FromString("ERROR");

 	// Parallelization settings

-	omp_set_num_threads(*num_threads);

+// 	omp_set_num_threads(*num_threads);

 	// Print some information

 	//FILE_LOG(logINFO) << "number of states = " << *N;

@@ -6,11 +6,11 @@

 #include "loghmm.h"

 #include <string> // strcmp

-#if defined TARGET_OS_MAC || defined __APPLE__

-#include <libiomp/omp.h> // parallelization options on mac

-#elif defined __linux__ || defined _WIN32 || defined _WIN64

-#include <omp.h> // parallelization options

-#endif

+// #if defined TARGET_OS_MAC || defined __APPLE__

+// #include <libiomp/omp.h> // parallelization options on mac

+// #elif defined __linux__ || defined _WIN32 || defined _WIN64

+// #include <omp.h> // parallelization options

+// #endif

 // void R_univariate_hmm(int* O, int* T, int* N, int* state_labels, double* size, double* prob, int* maxiter, int* maxtime, double* eps, int* states, double* A, double* proba, double* loglik, double* weights, int* distr_type, double* initial_size, double* initial_prob, double* initial_A, double* initial_proba, bool* use_initial_params, int* num_threads, int* error, int* read_cutoff, int* algorithm);

 // 

@@ -12,11 +12,11 @@

 #include <time.h> // time(), difftime()

 #include <string> // strcmp

-#if defined TARGET_OS_MAC || defined __APPLE__

-#include <libiomp/omp.h> // parallelization options on mac

-#elif defined __linux__ || defined _WIN32 || defined _WIN64

-#include <omp.h> // parallelization options

-#endif

+// #if defined TARGET_OS_MAC || defined __APPLE__

+// #include <libiomp/omp.h> // parallelization options on mac

+// #elif defined __linux__ || defined _WIN32 || defined _WIN64

+// #include <omp.h> // parallelization options

+// #endif

 class ScaleHMM  {