optimize add merge function for concatenate function

Author: syt123450

src/assets/image/Concatenate.js

@@ -1,49 +1,52 @@
-import { BasicLayer1d } from "../prime/BasicLayer1d";
-import { BasicLayer2d } from "../prime/BasicLayer2d";
-import { BasicLayer3d } from "../prime/BasicLayer3d";
 import {MergedLayer3d} from "./MergedLayer3d";
 
 function Add(layerList) {
 
-	let mergedElements = [];
+	let operatorType = "add";
 
-	let depth;
+	validate(layerList);
 
-	if (layerList.length > 0) {
-		depth = layerList[0].layerDimension;
-	} else {
-		console.error("Merge Layer missing elements.");
-	}
+	return createMergedLayer(layerList);
+
+	function validate(layerList) {
+
+		let depth;
+
+		if (layerList.length > 0) {
+			depth = layerList[0].layerDimension;
+		} else {
+			console.error("Merge Layer missing elements.");
+		}
+
+		for (let i = 0; i < layerList.length; i++) {
 
-	for (let i = 0; i < layerList.length; i++) {
+			if (layerList[i].layerDimension !== depth) {
+				console.error("Can not add layer with different depth.");
+			}
 
-		if (layerList[i].layerDimension !== depth) {
-			console.error("Can not add layer with different depth.");
 		}
 
-		mergedElements.push(layerList[i]);
 	}
 
-	if (mergedElements[0].layerDimension === 1) {
-		return ;
-	} else if (mergedElements[0].layerDimension === 2) {
-		return new BasicLayer2d({shape: [100, 100]});
-	} else if (mergedElements[0].layerDimension === 3) {
+	function createMergedLayer(layerList) {
 
-		let mergedLayer = new MergedLayer3d({
-			operator: "add",
-			mergedElements: mergedElements
-		});
+		if (layerList[0].layerDimension === 1) {
 
-		return mergedLayer;
-	} else {
+		} else if (layerList[0].layerDimension === 2) {
 
-	}
+		} else if (layerList[0].layerDimension === 3) {
 
-}
+			return new MergedLayer3d({
+				operator: operatorType,
+				mergedElements: layerList
+			});
+
+		} else {
+			console.error("Do not support layer add operation more than 4 dimension.");
+		}
 
-Add.prototype = {
+	}
 
-};
+}
 
 export { Add };

src/assets/image/concatenate.png

@@ -0,0 +1,11 @@
+function Concatenate(layerList) {
+
+
+
+}
+
+Concatenate.prototype = {
+
+};
+
+export { Concatenate };

src/layer/merge/Add.js

@@ -63,10 +63,18 @@ MergeLineGroupController.prototype = {
 		for (let i = 0; i < curveElements.length; i++) {
 
 			let startPos = startPosition;
-			let firstControlPointPos = startPos.clone().add(new THREE.Vector3(1.5 * this.actualWidth, 0, 0));
+
+			let controlTranslateXVector;
+			if (startPos.x >= 0) {
+				controlTranslateXVector = new THREE.Vector3(1.5 * this.actualWidth, 0, 0)
+			} else {
+				controlTranslateXVector = new THREE.Vector3(-1.5 * this.actualWidth, 0, 0)
+			}
+
+			let firstControlPointPos = startPos.clone().add(controlTranslateXVector);
 
 			let endPos = curveElements[i].getWorldPosition().sub(this.neuralGroup.getWorldPosition());
-			let secondControlPointPos = endPos.clone().add(new THREE.Vector3(1.5 * this.actualWidth, 0, 0));
+			let secondControlPointPos = endPos.clone().add(controlTranslateXVector);
 
 			let curve = new THREE.CubicBezierCurve3(
 				startPos,
@@ -75,6 +83,7 @@ MergeLineGroupController.prototype = {
 				endPos
 			);
 
+
 			let points = curve.getPoints( 50 );
 
 			if (forward) {

src/layer/merge/Concatenate.js

@@ -1,5 +1,6 @@
 import { CloseData } from "../assets/image/CloseData";
 import { PlusData } from "../assets/image/Plus";
+import { ConcatenateData } from "../assets/image/Concatenate";
 
 let TextureProvider = (function() {
 
@@ -9,6 +10,8 @@ let TextureProvider = (function() {
 			return CloseData;
 		} else if (name === "add") {
 			return PlusData;
+		} else if (name === "concatenate") {
+			return ConcatenateData;
 		}
 
 	}