Merge branch 'master' of ssh://git@git.actoron.com:20000/jadex/jadex.git

actoron · Feb 4, 2021 · c9e6aa1 · c9e6aa1
2 parents 88b7a47 + d9842f1
commit c9e6aa1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/DisplayPanel.java b/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/DisplayPanel.java
@@ -346,7 +346,10 @@ public void	setResults(final AreaData data)
 			public void run()
 			{
 				//short[][] results = data.fetchData();
-				DisplayPanel.this.data	= data;
+				if(data.fetchData()==null)
+					data.setData(new short[data.getSizeX()][data.getSizeY()]);
+				DisplayPanel.this.data = data;
+
 				dirty = true;
 
 				/*DisplayPanel.this.image	= createImage(results.length, results[0].length);
@@ -445,7 +448,7 @@ public void	addDataChunk(final PartDataChunk data)
 		{
 			public void run()
 			{
-				short[] chunk	= data.getData();
+				short[] chunk = data.getData();
 				short[][] results;
 				results = DisplayPanel.this.data.fetchData();
 
@@ -528,7 +531,12 @@ protected void paintComponent(Graphics g)
 		if(data!=null)
 		{
 			short[][] results = data.fetchData();
+
+			if(results==null)
+				return;
+
 			//if(image==null || image.getWidth(this)!=results[0].length || image.getHeight(this)!=results.length)
+			//image = createImage(data.getSizeX(), data.getSizeY());
 			image = createImage(results.length, results[0].length);
 
 			Graphics go = image.getGraphics();
@@ -1031,9 +1039,9 @@ protected void calcArea(double x1, double x2, double y1, double y2, int sizex, i
 
 		if(genservice!=null)
 		{
-			genservice.generateArea(ad).addResultListener(new SwingDefaultResultListener<AreaData>()
+			genservice.generateArea(ad).addResultListener(new SwingDefaultResultListener<Void>()
 			{
-				public void customResultAvailable(AreaData result)
+				public void customResultAvailable(Void result)
 				{
 					// already done with partials
 					//DisplayPanel.this.setResults(result);

diff --git a/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/GenerateService.java b/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/GenerateService.java
@@ -114,7 +114,8 @@ public IFuture<Void> calcDefaultImage()
 	/**
 	 *  Generate a specific area using a defined x and y size.
 	 */
-	public IFuture<AreaData> generateArea(final AreaData data)
+	//public IFuture<AreaData> generateArea(final AreaData data)
+	public IFuture<Void> generateArea(final AreaData data)
 	{
 		GenerateAgent ga = (GenerateAgent)agent.getFeature(IPojoComponentFeature.class).getPojoAgent();
 
@@ -136,9 +137,10 @@ public void run()
 	/**
 	 *  Distribute the work to available or newly created calculation services.
 	 */
-	protected IFuture<AreaData>	distributeWork(final AreaData data)
+	//protected IFuture<AreaData>	distributeWork(final AreaData data)
+	protected IFuture<Void>	distributeWork(final AreaData data)
 	{
-		final Future<AreaData> ret = new Future<AreaData>();	
+		final Future<Void> ret = new Future<>();	
 
 		// Split area into work units.
 		final Set<AreaData>	areas = new HashSet<>();	// {AreaData}
@@ -182,7 +184,7 @@ protected IFuture<AreaData>	distributeWork(final AreaData data)
 		}
 
 		// Create array for holding results.
-		data.setData(new short[data.getSizeX()][data.getSizeY()]);
+		//data.setData(new short[data.getSizeX()][data.getSizeY()]);
 
 		// Assign tasks to service pool.
 		final int number = areas.size();
@@ -205,10 +207,7 @@ public void intermediateResultAvailable(AreaData ad)
 			{
 				if(ad.fetchData()==null)
 					return;
-
-				int xs = ad.getXOffset();
-				int ys = ad.getYOffset();
-
+
 				SwingUtilities.invokeLater(new Runnable()
 				{
 					public void run()
@@ -217,9 +216,13 @@ public void run()
 					}
 				});
 
+//				int xs = ad.getXOffset();
+//				int ys = ad.getYOffset();
+
 	//			System.out.println("x:y: end "+xs+" "+ys);
 	//			System.out.println("partial: "+SUtil.arrayToString(ad.getData()));
-				for(int yi=0; yi<ad.getSizeY(); yi++)
+
+				/*for(int yi=0; yi<ad.getSizeY(); yi++)
 				{
 					for(int xi=0; xi<ad.getSizeX(); xi++)
 					{
@@ -232,14 +235,15 @@ public void run()
 							e.printStackTrace();
 						}
 					}
-				}
+				}*/
 			}
 
 			public void finished()
 			{
 //				double	millis	= ((System.nanoTime() - time)/100000)/10.0;
 //				System.out.println("took: "+millis+" millis.");
-				ret.setResult(data);
+				//ret.setResult(data);
+				ret.setResult(null);
 			}
 		}));
 

diff --git a/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/IGenerateService.java b/applications/micro/src/main/java/jadex/micro/examples/mandelbrot_new/IGenerateService.java
@@ -12,7 +12,8 @@ public interface IGenerateService
 	/**
 	 *  Generate a specific area using a defined x and y size.
 	 */
-	public IFuture<AreaData> generateArea(AreaData data);
+	public IFuture<Void> generateArea(AreaData data);
+	//public IFuture<AreaData> generateArea(AreaData data);
 
 	/**
 	 *  Calculate and display the default image from current settings.