v0.6.1

miraclelife · Apr 20, 2019 · 73b1cdd · 73b1cdd
1 parent 7fd32f5
commit 73b1cdd
Show file tree

Hide file tree

Showing 6 changed files with 201 additions and 15 deletions.
diff --git a/dist/tensorspace.cjs.js b/dist/tensorspace.cjs.js
@@ -21892,9 +21892,22 @@ function Reshape( config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 	this.openFmCenters = undefined;
 
+	this.lastLayer = undefined;
+
+	if ( config !== undefined &&
+		( config.targetShape !== undefined || config.shape !== undefined ) ) {
+
+		this.setReshapeType();
+		this.createActualLayer();
+		this.updateLayerMetric();
+
+	}
+
 }
 
 Reshape.prototype = {
@@ -21945,10 +21958,14 @@ Reshape.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
 
+		this.lastLayer = this.actualLayer.lastLayer;
+
 	},
 
 	/**
@@ -21997,6 +22014,13 @@ Reshape.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -22043,6 +22067,20 @@ Reshape.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
+	apply: function( lastLayer ) {
+
+		this.actualLayer.apply( lastLayer );
+
+		this.updateLayerMetric();
+
+	},
+
 	setShape: function( shape ) {
 
 		// Based on shape dimension, update proxy states.
@@ -22077,6 +22115,15 @@ Reshape.prototype = {
 
 	assemble: function() {
 
+		this.setReshapeType();
+
+		this.actualLayer.assemble();
+		this.updateLayerMetric();
+
+	},
+
+	setReshapeType: function() {
+
 		// If "setShape" has been called before, there is no need to check "shape" attribute or "targetShape" attribute in config.
 
 		if ( this.reshapeType === undefined ) {
@@ -22139,9 +22186,6 @@ Reshape.prototype = {
 
 		}
 
-		this.actualLayer.assemble();
-		this.updateLayerMetric();
-
 	}
 
 };
@@ -31329,6 +31373,8 @@ function MergeProxy( operatorType, layerList, config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 
 	this.openFmCenters = undefined;
@@ -31373,6 +31419,8 @@ MergeProxy.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
@@ -31420,6 +31468,14 @@ MergeProxy.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			MergeValidator.validateDimension( this.layerList );
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -31472,6 +31528,12 @@ MergeProxy.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
 	setShape: function( shape ) {
 
 		// make sure the input elements have the same dimension.
@@ -31863,7 +31925,7 @@ function Multiply( layerList, config ) {
 
 }
 
-let version = "0.6.0";
+let version = "0.6.1";
 
 /**
  * @author syt123450 / https://github.com/syt123450

diff --git a/dist/tensorspace.dev.esm.js b/dist/tensorspace.dev.esm.js
@@ -22547,9 +22547,22 @@ function Reshape( config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 	this.openFmCenters = undefined;
 
+	this.lastLayer = undefined;
+
+	if ( config !== undefined &&
+		( config.targetShape !== undefined || config.shape !== undefined ) ) {
+
+		this.setReshapeType();
+		this.createActualLayer();
+		this.updateLayerMetric();
+
+	}
+
 }
 
 Reshape.prototype = {
@@ -22600,10 +22613,14 @@ Reshape.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
 
+		this.lastLayer = this.actualLayer.lastLayer;
+
 	},
 
 	/**
@@ -22652,6 +22669,13 @@ Reshape.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -22698,6 +22722,20 @@ Reshape.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
+	apply: function( lastLayer ) {
+
+		this.actualLayer.apply( lastLayer );
+
+		this.updateLayerMetric();
+
+	},
+
 	setShape: function( shape ) {
 
 		// Based on shape dimension, update proxy states.
@@ -22732,6 +22770,15 @@ Reshape.prototype = {
 
 	assemble: function() {
 
+		this.setReshapeType();
+
+		this.actualLayer.assemble();
+		this.updateLayerMetric();
+
+	},
+
+	setReshapeType: function() {
+
 		// If "setShape" has been called before, there is no need to check "shape" attribute or "targetShape" attribute in config.
 
 		if ( this.reshapeType === undefined ) {
@@ -22794,9 +22841,6 @@ Reshape.prototype = {
 
 		}
 
-		this.actualLayer.assemble();
-		this.updateLayerMetric();
-
 	}
 
 };
@@ -31984,6 +32028,8 @@ function MergeProxy( operatorType, layerList, config ) {
 	this.actualHeight = undefined;
 	this.actualDepth = undefined;
 
+	this.depth = undefined;
+
 	this.layerDimension = undefined;
 
 	this.openFmCenters = undefined;
@@ -32028,6 +32074,8 @@ MergeProxy.prototype = {
 		this.actualHeight = this.actualLayer.actualHeight;
 		this.actualDepth = this.actualLayer.actualDepth;
 
+		this.depth = this.actualLayer.depth;
+
 		this.layerDimension = this.actualLayer.layerDimension;
 
 		this.openFmCenters = this.actualLayer.openFmCenters;
@@ -32075,6 +32123,14 @@ MergeProxy.prototype = {
 
 	setEnvironment: function( context, model ) {
 
+		if ( this.actualLayer === undefined ) {
+
+			MergeValidator.validateDimension( this.layerList );
+			this.createActualLayer();
+			this.updateLayerMetric();
+
+		}
+
 		this.actualLayer.setEnvironment( context, model );
 
 	},
@@ -32127,6 +32183,12 @@ MergeProxy.prototype = {
 
 	},
 
+	translateLayer: function( targetCenter, translateTime ) {
+
+		this.actualLayer.translateLayer( targetCenter, translateTime );
+
+	},
+
 	setShape: function( shape ) {
 
 		// make sure the input elements have the same dimension.
@@ -32518,7 +32580,7 @@ function Multiply( layerList, config ) {
 
 }
 
-let version = "0.6.0";
+let version = "0.6.1";
 
 /**
  * @author syt123450 / https://github.com/syt123450