subtract1d, maximum1d, multiply1d, average1d (#14)

src/layer/abstract/MergedLayer.js

@@ -54,6 +54,15 @@ function MergedLayer( config ) {
 
 	this.mergedElements = [];
 
+	/**
+	 * layerType will be set based on operation strategy.
+	 * For example: Add3d, Subtract1d, Maximum2d
+	 *
+	 * @type { String }
+	 */
+
+	this.layerType = undefined;
+
 }
 
 MergedLayer.prototype = Object.assign( Object.create( Layer.prototype ), {

src/layer/abstract/MergedLayer3d.js

@@ -82,15 +82,6 @@ function MergedLayer3d( config ) {
 
 	this.autoOutputDetect = false;
 
-	/**
-	 * layerType will be set based on operation strategy.
-	 * For example: Add3d
-	 *
-	 * @type { String }
-	 */
-
-	this.layerType = undefined;
-
 	// Init concrete strategy based on config.
 
 	this.initStrategy( config );

src/merge/Average.js

@@ -2,6 +2,7 @@
  * @author syt123450 / https://github.com/syt123450
  */
 
+import { MergedLayer1d } from "../layer/abstract/MergedLayer1d";
 import { MergedLayer2d } from "../layer/abstract/MergedLayer2d";
 import { MergedLayer3d } from "../layer/abstract/MergedLayer3d";
 
@@ -43,6 +44,14 @@ function Average( layerList, config ) {
 
 		if ( layerList[ 0 ].layerDimension === 1 ) {
 
+			return new MergedLayer1d( {
+
+				operator: operatorType,
+				mergedElements: layerList,
+				userConfig: userConfig
+
+			} );
+
 		} else if ( layerList[ 0 ].layerDimension === 2 ) {
 
 			return new MergedLayer2d( {

src/merge/Maximum.js

@@ -2,6 +2,7 @@
  * @author syt123450 / https://github.com/syt123450
  */
 
+import { MergedLayer1d } from "../layer/abstract/MergedLayer1d";
 import { MergedLayer2d } from "../layer/abstract/MergedLayer2d";
 import { MergedLayer3d } from "../layer/abstract/MergedLayer3d";
 
@@ -43,6 +44,14 @@ function Maximum( layerList, config ) {
 
 		if ( layerList[ 0 ].layerDimension === 1 ) {
 
+			return new MergedLayer1d( {
+
+				operator: operatorType,
+				mergedElements: layerList,
+				userConfig: userConfig
+
+			} );
+
 		} else if ( layerList[ 0 ].layerDimension === 2 ) {
 
 			return new MergedLayer2d( {

src/merge/Multiply.js

@@ -2,6 +2,7 @@
  * @author syt123450 / https://github.com/syt123450
  */
 
+import { MergedLayer1d } from "../layer/abstract/MergedLayer1d";
 import { MergedLayer2d } from "../layer/abstract/MergedLayer2d";
 import { MergedLayer3d } from "../layer/abstract/MergedLayer3d";
 
@@ -43,6 +44,14 @@ function Multiply( layerList, config ) {
 
 		if ( layerList[ 0 ].layerDimension === 1 ) {
 
+			return new MergedLayer1d( {
+
+				operator: operatorType,
+				mergedElements: layerList,
+				userConfig: userConfig
+
+			} );
+
 		} else if ( layerList[ 0 ].layerDimension === 2 ) {
 
 			return new MergedLayer2d( {

src/merge/Subtract.js

@@ -2,6 +2,7 @@
  * @author syt123450 / https://github.com/syt123450
  */
 
+import { MergedLayer1d } from "../layer/abstract/MergedLayer1d";
 import { MergedLayer2d } from "../layer/abstract/MergedLayer2d";
 import { MergedLayer3d } from "../layer/abstract/MergedLayer3d";
 
@@ -43,6 +44,14 @@ function Subtract( layerList, config ) {
 
 		if ( layerList[ 0 ].layerDimension === 1 ) {
 
+			return new MergedLayer1d( {
+
+				operator: operatorType,
+				mergedElements: layerList,
+				userConfig: userConfig
+
+			} );
+
 		} else if ( layerList[ 0 ].layerDimension === 2 ) {
 
 			return new MergedLayer2d( {

src/merge/factory/StrategyFactory.js

@@ -16,6 +16,10 @@ import { Average2d } from "../strategy/Average2d";
 import { Multiply2d } from "../strategy/Multiply2d";
 import { Concatenate2d } from "../strategy/Concatenate2d";
 import { Add1d } from "../strategy/Add1d";
+import { Subtract1d } from "../strategy/Subtract1d";
+import { Maximum1d } from "../strategy/Maximum1d";
+import { Average1d } from "../strategy/Average1d";
+import { Multiply1d } from "../strategy/Multiply1d";
 
 let StrategyFactory = ( function() {
 
@@ -89,7 +93,31 @@ let StrategyFactory = ( function() {
 
 			if ( operator === "add" ) {
 
-				return new Add1d( mergedElements );
+				return new Add2d( mergedElements );
+
+			} else if ( operator === "concatenate" ) {
+
+
+
+			} else if ( operator === "subtract" ) {
+
+				return new Subtract1d( mergedElements );
+
+			} else if ( operator === "multiply" ) {
+
+				return new Multiply1d( mergedElements );
+
+			} else if ( operator === "dot" ) {
+
+
+
+			} else if ( operator === "maximum" ) {
+
+				return new Maximum1d( mergedElements );
+
+			} else if ( operator === "average" ) {
+
+				return new Average1d( mergedElements );
 
 			}
 

src/merge/strategy/Average1d.js

@@ -0,0 +1,17 @@
+/**
+ * @author syt123450 / https://github.com/syt123450
+ */
+
+import { StableMerge1d } from "../abstract/StableMerge1d";
+
+function Average1d( mergedElements ) {
+
+	StableMerge1d.call( this, mergedElements );
+
+	this.strategyType = "Average1d";
+
+}
+
+Average1d.prototype = Object.assign( Object.create( StableMerge1d.prototype ) );
+
+export { Average1d };

src/merge/strategy/Maximum1d.js

@@ -0,0 +1,17 @@
+/**
+ * @author syt123450 / https://github.com/syt123450
+ */
+
+import { StableMerge1d } from "../abstract/StableMerge1d";
+
+function Maximum1d( mergedElements ) {
+
+	StableMerge1d.call( this, mergedElements );
+
+	this.strategyType = "Maximum1d";
+
+}
+
+Maximum1d.prototype = Object.assign( Object.create( StableMerge1d.prototype ) );
+
+export { Maximum1d };

src/merge/strategy/Multiply1d.js

@@ -0,0 +1,17 @@
+/**
+ * @author syt123450 / https://github.com/syt123450
+ */
+
+import { StableMerge1d } from "../abstract/StableMerge1d";
+
+function Multiply1d( mergedElements ) {
+
+	StableMerge1d.call( this, mergedElements );
+
+	this.strategyType = "Multiply1d";
+
+}
+
+Multiply1d.prototype = Object.assign( Object.create( StableMerge1d.prototype ) );
+
+export { Multiply1d };

src/merge/strategy/Subtract1d.js

@@ -0,0 +1,17 @@
+/**
+ * @author syt123450 / https://github.com/syt123450
+ */
+
+import { StableMerge1d } from "../abstract/StableMerge1d";
+
+function Subtract1d( mergedElements ) {
+
+	StableMerge1d.call( this, mergedElements );
+
+	this.strategyType = "Subtract1d";
+
+}
+
+Subtract1d.prototype = Object.assign( Object.create( StableMerge1d.prototype ) );
+
+export { Subtract1d };

test/test.html

@@ -68,7 +68,7 @@
 
     model.add( dense2 );
 
-    let addLayer = TSP.layers.Add( [ dense1, dense2 ] );
+    let addLayer = TSP.layers.Average( [ dense1, dense2 ] );
 
     model.add( addLayer );