Fix renewObject()

lauerfab · Dec 11, 2015 · 7ff3c47 · 7ff3c47
1 parent 2fb080e
commit 7ff3c47
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 8 deletions.
diff --git a/lalolab/lalolabworker.js b/lalolab/lalolabworker.js
@@ -1501,6 +1501,17 @@ function renewObject( obj ) {
 				var newobj = new Class(typearray[1]);
 			for ( var p in obj ) 
 				newobj[p] = renewObject(obj[p]);
+
+
+			// deal with particular cases: 
+			// Rebuild kernelFunc 
+			if (typearray[1] == "SVM" || typearray[1] == "SVR" ) {				
+				newobj["kernelFunc"] = kernelFunction(newobj["kernel"], newobj["kernelpar"], type(newobj["SV"]) == "spmatrix"?"spvector":"vector");
+			}
+			if (typearray[1] == "KernelRidgeRegression" ) {
+				newobj["kernelFunc"] = kernelFunction(newobj["kernel"], newobj["kernelpar"], type(newobj["X"]) == "spmatrix"?"spvector":"vector");
+			}
+
 			return newobj;
 			break;
 	}

diff --git a/lalolab/src/lalolibbase.js b/lalolab/src/lalolibbase.js
@@ -1420,7 +1420,23 @@ function getObjectWithoutFunc( obj ) {
 		for (var p in obj ) {
 			switch( type(obj[p]) ) {
 			case "vector": 
+				res[p] = {type: "vector", data: [].slice.call(obj[p])};
+				break;
 			case "matrix":
+				res[p] = obj[p];
+				res[p].val = [].slice.call(obj[p].val);
+				break;
+			case "spvector":
+				res[p] = obj[p];
+				res[p].val = [].slice.call(obj[p].val);
+				res[p].ind = [].slice.call(obj[p].ind);
+				break;
+			case "spmatrix":
+				res[p] = obj[p];
+				res[p].val = [].slice.call(obj[p].val);
+				res[p].cols = [].slice.call(obj[p].cols);
+				res[p].rows = [].slice.call(obj[p].rows);
+				break;
 			case "undefined":
 				res[p] = obj[p];
 				break;
@@ -1434,7 +1450,7 @@ function getObjectWithoutFunc( obj ) {
 			default:
 				res[p] = getObjectWithoutFunc( obj[p] );
 				break;			
-			}						
+			}	
 		}
 		return res;
 	}
@@ -1448,14 +1464,21 @@ function renewObject( obj ) {
 		case "number":
 		case "boolean":
 		case "string":
-		case "vector":
 		case "undefined":
 			return obj;
 			break;
+		case "vector":
+			return new Float64Array(obj.data);
+			break;
 		case "matrix":
-			return new Matrix(obj.m, obj.n, obj.val, true);
+			return new Matrix(obj.m, obj.n, obj.val);
+			break;
+		case "spvector":
+			return new spVector(obj.length,obj.val,obj.ind);
+			break;
+		case "spmatrix":
+			return new spMatrix(obj.m, obj.n, obj.val, obj.cols, obj.rows);
 			break;
-
 		case "object":
 			// Object without type property and thus without Class		
 			var newobj = {}; 

diff --git a/lalolab/src/linalg.js b/lalolab/src/linalg.js
@@ -2886,12 +2886,12 @@ function issymmetric ( A ) {
  */
 function mat( elems, rowwise ) {
 	var k;
-	var onlyVectorsAndNumbers = true;
+	var concatWithNumbers = false;
 	var elemtypes = new Array(elems.length);
 	for ( k=0; k < elems.length; k++) {
 		elemtypes[k] = type(elems[k]);
-		if ( elemtypes[k] != "number" && elemtypes[k] != "vector" && elemtypes[k] != "spvector")
-			onlyVectorsAndNumbers = false;
+		if ( elemtypes[k] == "number" ) 
+			concatWithNumbers = true;		
 	}
 
 
@@ -2931,7 +2931,7 @@ function mat( elems, rowwise ) {
 				break;
 
 			case "vector": 				
-				if ( onlyVectorsAndNumbers ) {
+				if ( concatWithNumbers ) {
 					// return a column by concatenating vectors and numbers
 					for ( var l=0; l < elems[k].length; l++)
 						res.push(elems[k][l]) ;