Change int the batch size

OpenEMS · Oct 7, 2024 · 1883875 · 1883875
1 parent 3eade01
commit 1883875
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 28 deletions.
diff --git a/...enems.edge.predictor.lstmmodel/src/io/openems/edge/predictor/lstmmodel/LstmModelImpl.java b/...enems.edge.predictor.lstmmodel/src/io/openems/edge/predictor/lstmmodel/LstmModelImpl.java
@@ -10,8 +10,6 @@
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.SortedMap;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -129,34 +127,17 @@ protected Prediction createNewPrediction(ChannelAddress channelAddress) {
 		var hyperParameters = ReadAndSaveModels.read(channelAddress.getChannelId());
 		var nowDate = ZonedDateTime.now();
 
-		var seasonalityPredictionFuture = CompletableFuture.supplyAsync(() -> {
-			return this.predictSeasonality(channelAddress, nowDate, hyperParameters);
-		});
-
-		var trendPredictionFuture = CompletableFuture.supplyAsync(() -> {
-			return this.predictTrend(channelAddress, nowDate, hyperParameters);
-		});
-
-		/*
-		 * Combine predictions only after both seasonalityPredictionFuture and
-		 * trendPredictionFuture are complete
-		 */
-		var predicted = seasonalityPredictionFuture.thenCombine(trendPredictionFuture, (seasonality, trend) -> {
-			return combine(seasonality, trend);
-		});
+		var seasonalityPrediction = this.predictSeasonality(channelAddress, nowDate, hyperParameters);
+		var trendPrediction = this.predictTrend(channelAddress, nowDate, hyperParameters);
 
+		var predicted = combine(trendPrediction, seasonalityPrediction);
 		var till = nowDate.withMinute(getMinute(nowDate, hyperParameters)).withSecond(0).withNano(0);
 
-		try {
-			return Prediction.from(//
-					Prediction.getValueRange(this.sum, channelAddress), //
-					Interval.DUODCIMUS, //
-					till, //
-					DOUBLELIST_TO_INTARRAY.apply(predicted.get()));
-		} catch (InterruptedException | ExecutionException e) {
-			e.printStackTrace();
-			return null;
-		}
+		return Prediction.from(//
+				Prediction.getValueRange(this.sum, channelAddress), //
+				Interval.DUODCIMUS, //
+				till, //
+				DOUBLELIST_TO_INTARRAY.apply(predicted));
 	}
 
 	/**

diff --git a/...e.predictor.lstmmodel/src/io/openems/edge/predictor/lstmmodel/common/HyperParameters.java b/...e.predictor.lstmmodel/src/io/openems/edge/predictor/lstmmodel/common/HyperParameters.java
@@ -135,7 +135,7 @@ public OffsetDateTime getLastTrainedDate() {
 	 * of range errors during training.</li>
 	 * </ul>
 	 */
-	private int batchSize = 10;
+	private int batchSize = 1;
 
 	/**
 	 * Counter for tracking batches.