Add CellTemplate

core/pom.xml

@@ -78,6 +78,21 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>  
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <useUniqueVersions>false</useUniqueVersions>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.github.drinkjava2.frog.Application</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
        </plugins>       
     </build> 
     

core/run.sh

@@ -0,0 +1,2 @@
+mvn clean package
+java -jar target/frog-*.jar

core3d/pom.xml

@@ -78,6 +78,21 @@
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>  
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+				<version>3.1.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <useUniqueVersions>false</useUniqueVersions>
+                            <classpathPrefix>lib/</classpathPrefix>
+                            <mainClass>com.github.drinkjava2.frog.Application</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
        </plugins>       
     </build> 
     

core3d/run.sh

@@ -0,0 +1,2 @@
+mvn clean package
+java -jar target/frog-*.jar

core3d/src/main/java/com/github/drinkjava2/frog/brain/BrainPicture.java

@@ -32,7 +32,6 @@ public class BrainPicture extends JPanel {
 	Color color = Color.red;
 	int brainDispWidth; // screen display piexls width
 	float scale; // brain scale
-	int pointDia; // point size
 	int xOffset = 0; // brain display x offset compare to screen
 	int yOffset = 0; // brain display y offset compare to screen
 	float xAngle = (float) (Math.PI / 2.5); // brain rotate on x axis
@@ -44,7 +43,6 @@ public class BrainPicture extends JPanel {
 		this.setLayout(null);// 空布局
 		this.brainDispWidth = brainDispWidth;
 		scale = 0.7f * brainDispWidth / brainWidth;
-		pointDia = Math.max(Math.round(scale), 1);
 		this.setBounds(x, y, brainDispWidth + 1, brainDispWidth + 1);
 		MouseAction act = new MouseAction(this);
 		this.addMouseListener(act);
@@ -141,7 +139,7 @@ public class BrainPicture extends JPanel {
 
 	/** 画点，固定以top视角的角度，所以只需要在x1,y1位置画一个点 */
 	public void drawCubeCenter(float x, float y, float z) {
-		drawPoint(x + 0.5f, y + 0.5f, z + 0.5f, pointDia);
+		drawPoint(x + 0.5f, y + 0.5f, z + 0.5f, (int) Math.max(1, Math.round(scale * .7)));
 	}
 
 	/** 画点，固定以top视角的角度，所以只需要在x1,y1位置画一个点 */
@@ -183,7 +181,7 @@ public class BrainPicture extends JPanel {
 		return rainbow[nextColor++];
 	}
 
-	public static Color rainboColor(float i) {
+	public static Color rainbowColor(float i) {
 		if (i == 0)
 			return Color.black;
 		if (i == 1)
@@ -224,8 +222,8 @@ public class BrainPicture extends JPanel {
 				for (int y = 0; y < Env.FROG_BRAIN_YSIZE; y++) {
 					if (f.cubes[x][y] != null)
 						for (int z = 0; z < Env.FROG_BRAIN_ZSIZE; z++) {
-							if (f.existCube(x, y, z)) {
-								setColor(rainboColor(f.getCube(x, y, z).getActive()));
+							if (f.existCube(x, y, z) && f.getCube(x, y, z).getActive()>0) {
+								setColor(rainbowColor(f.getCube(x, y, z).getActive()));
 								drawCubeCenter(x, y, z);
 							}
 						}

core3d/src/main/java/com/github/drinkjava2/frog/brain/Cell.java

@@ -13,14 +13,18 @@ package com.github.drinkjava2.frog.brain;
 /**
  * Cell is the basic unit of frog's brain
  * 
+ * Cell这个类只保存很少的信息，而不是直接定义成对象，这样可方便它的参数变异。它的触突分布参数、对信号(即光子)的处理行为由CellTemplate
+ * 中的type来完成。 Cell的排布由器官来完成，一个器官通常会撒布一群相同类型的细胞。
+ * 
  * @author Yong Zhu
- * @since 1.0
+ * @since 2.0.2
  */
 public class Cell {
-	public byte cellType; // 这个细胞的类型
+	public int type; // 这个细胞的类型，见CellTemplate类中的type
 
 	// energy of cell, energy got from food
 	public float energy; // 每个细胞当前的能量值
-	public float tire; // 每个细胞的疲劳值
+
+	public float tire; // 每个细胞的疲劳值，只取决于最近的激活频率
 
 }

core3d/src/main/java/com/github/drinkjava2/frog/brain/CellTemplate.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 the original author or authors. 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ * applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package com.github.drinkjava2.frog.brain;
+
+import java.io.Serializable;
+
+import com.github.drinkjava2.frog.Frog;
+
+/**
+ * CellTemplate is the cell template, a group of CellTemplate be saved in egg
+ * 
+ * CellTemplate描述细胞的形状和行为，其中触突数量和参数是有可能随机变异的。行为则是硬编码不可以变异，模拟单个神经元的逻辑，不同的细胞有不同的
+ * 行为，通过cellType来区分，虽然行为不可以变异，但是可以写出尽可能多种不同的行为，由生存竟争来筛选。
+ * CellTemplate是可串行化的，一组CellTemplate实例会保存在蛋里面。
+ * 每个脑细胞都指向某个type类型，CellTemplate本身都是单例，不占内存，从命名上可以看出它只是个模板，它是无状态的，只影响 cell处理
+ * 信息（光子）的逻辑
+ * 
+ * 
+ * @author Yong Zhu
+ * @since 2.0.2
+ */
+public class CellTemplate implements Serializable {
+	private static final long serialVersionUID = 1L;
+	public int type; // 当创建CellType实例
+	public Synapse[] inputs; // 输入触突，位置是相对细胞而言的
+	public Synapse[] sides; // 侧面（通常是抑制，是负光子输出)输出触突们，才从脉冲神经网络了解到有这种侧向抑制
+	public Synapse[] outputs; // 输出触突
+
+	/**
+	 * Each cell's act method will be called once at each loop step
+	 * 
+	 * 在轮循时，每个细胞的act方法都会被调用一次，这个方法针对不同的细胞类型有不同的行为逻辑，这是硬编码，要 多尝试各种不同的行为，然后抛给电脑去筛选。
+	 * 
+	 */
+	public void act(Frog f, Cell cell, int x, int y, int z) {
+		switch (type) { // TODO 待添加细胞的行为，这是硬编码
+		case 0:
+			break;
+		case 1:
+			break;
+		case 2:
+			break;
+		case 3:
+			break;
+		case 4:
+			break;
+		default:
+			break;
+		}
+	}
+}

core3d/src/main/java/com/github/drinkjava2/frog/brain/MouseAction.java

@@ -43,10 +43,15 @@ public class MouseAction implements MouseListener, MouseWheelListener, MouseMoti
 
 	@Override
 	public void mouseWheelMoved(MouseWheelEvent e) {// 缩放
-		if (e.getWheelRotation() < 0)
+		if (e.getWheelRotation() < 0) {
 			brainPic.scale *= 1.1;
-		else
+			brainPic.xOffset *= 1.1;
+			brainPic.yOffset *= 1.1;
+		} else {
 			brainPic.scale /= 1.1;
+			brainPic.xOffset /= 1.1;
+			brainPic.yOffset /= 1.1;
+		}
 	}
 
 	@Override
@@ -71,13 +76,13 @@ public class MouseAction implements MouseListener, MouseWheelListener, MouseMoti
 		}
 		if (buttonPressed == 2) {// 平移
 			if (e.getX() > x)
-				brainPic.xOffset+=6;
+				brainPic.xOffset += 6;
 			if (e.getX() < x)
-				brainPic.xOffset-=6;
+				brainPic.xOffset -= 6;
 			if (e.getY() > y)
-				brainPic.yOffset+=6;
+				brainPic.yOffset += 6;
 			if (e.getY() < y)
-				brainPic.yOffset-=6;
+				brainPic.yOffset -= 6;
 			x = e.getX();
 			y = e.getY();
 		}

core3d/src/main/java/com/github/drinkjava2/frog/brain/Synapse.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018 the original author or authors. 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ * applicable law or agreed to in writing, software distributed under the
+ * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ * OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+package com.github.drinkjava2.frog.brain;
+
+import java.io.Serializable;
+
+/**
+ * Synapse can be input, output, side synapse
+ * 
+ * 触突
+ * 
+ * @author Yong Zhu
+ * @since 2.0.2
+ */
+public class Synapse implements Serializable {
+	private static final long serialVersionUID = 1L;
+	public int x; // 这个触突相对于细胞的x偏移坐标
+	public int y;// 这个触突相对于细胞的y偏移坐标
+	public int z;// 这个触突相对于细胞的z偏移坐标
+	public int r; // 这个触突的作用范围
+}

core3d/src/main/java/com/github/drinkjava2/frog/util/StringPixelUtils.java

@@ -53,13 +53,14 @@ public class StringPixelUtils {
 		for (int y = 0; y < strHeight; y++)
 			for (int x = 0; x < strWidth; x++)
 				if (bi.getRGB(x, y) == -1)
-					b[x][strHeight-y-1] = 1;
+					b[x][strHeight - y - 1] = 1;
 				else
-					b[x][strHeight-y-1] = 0;
+					b[x][strHeight - y - 1] = 0;
 		lettersMap.put(key, b);
 		return b;
 	}
 
+	/*- 这个是测试输出，平时不需要用 
 	public static void main(String[] args) {
 		byte[][] c = getStringPixels(Font.SANS_SERIF, Font.PLAIN, 12, "Test点阵输出");
 		int w = c.length;
@@ -67,7 +68,7 @@ public class StringPixelUtils {
 	
 		for (int y = 0; y < h; y++) {
 			for (int x = 0; x < w; x++) {
-				if (c[x][h-y-1]>0)
+				if (c[x][h - y - 1] > 0)
 					System.out.print("*");
 				else
 					System.out.print(" ");
@@ -75,4 +76,5 @@ public class StringPixelUtils {
 			System.out.println();
 		}
 	}
+	*/
 }

捐款记录.md

@@ -5,6 +5,7 @@ wangtao
 dotao  
 LongFer  
 张老湿  
+王二麻子  
 
-目前收入总额:98.88元  
+目前收入总额:108.88元  
 目前支出总额:0元