Innovenergy
/
Innovenergy_trunk
2
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Improved Aggregator file.

This commit is contained in:
atef 2023-12-13 15:36:41 +01:00
parent 4f1f0b0844
commit 6ef765f92b
1 changed files with 51 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
csharp/App/SaliMax/src/AggregationService/Aggregator.cs
View File

@ -1,6 +1,5 @@
using System.Runtime.InteropServices;
using InnovEnergy.Lib.Utils; using InnovEnergy.Lib.Utils;
using static System.Double;
namespace InnovEnergy.App.SaliMax.AggregationService; namespace InnovEnergy.App.SaliMax.AggregationService;
public static class Aggregator public static class Aggregator
@ -8,11 +7,11 @@ public static class Aggregator
public static async Task HourlyDataAggregationManager() public static async Task HourlyDataAggregationManager()
{ {
DateTime currentDateTime = DateTime.Now; var currentDateTime = DateTime.Now;
DateTime nextRoundedHour = currentDateTime.AddHours(1).AddMinutes(-currentDateTime.Minute).AddSeconds(-currentDateTime.Second); var nextRoundedHour = currentDateTime.AddHours(1).AddMinutes(-currentDateTime.Minute).AddSeconds(-currentDateTime.Second);
// Calculate the time until the next rounded hour // Calculate the time until the next rounded hour
TimeSpan timeUntilNextHour = nextRoundedHour - currentDateTime; var timeUntilNextHour = nextRoundedHour - currentDateTime;
// Output the current and next rounded hour times // Output the current and next rounded hour times
Console.WriteLine("Current Date and Time: " + currentDateTime); Console.WriteLine("Current Date and Time: " + currentDateTime);
@ -46,143 +45,66 @@ public static class Aggregator
var csvFiles = Directory.GetFiles(myDirectory, "*.csv"); var csvFiles = Directory.GetFiles(myDirectory, "*.csv");
var currentTimestamp = DateTime.Now.ToUnixTime(); var currentTimestamp = DateTime.Now.ToUnixTime();
Double socAverage = 0; var oneHourBefore = DateTime.Now.AddHours(-1).ToUnixTime();
Double pvPowerAverage = 0;
Double batteryPowerAverage = 0;
Console.WriteLine("-----------------------------------------------------------------------------------------------------------------"); Console.WriteLine("-----------------------------------------------------------------------------------------------------------------");
Console.WriteLine("File timestamp should start after "+ DateTime.Now.AddHours(-1)); Console.WriteLine("File timestamp should start after "+ DateTime.Now.AddHours(-1));
var validFiles = csvFiles
.Where(csvFile => IsFileWithinTimeRange(csvFile, oneHourBefore, currentTimestamp))
.ToList();
foreach (var csvFile in csvFiles) try
{ {
var average1HSoc = validFiles
if (csvFile == "LogDirectory/log.csv") .Select(csvFile => csvFile.ExtractValue("/Battery/Soc"))
{ .NotNull()
continue; .Average();
}
var fileTimestamp = long.Parse(Path.GetFileNameWithoutExtension(csvFile).Replace("log_", "")); var average1HPvPower = validFiles
var oneHourBefore = DateTime.Now.AddHours(-1).ToUnixTime(); .Select(csvFile => csvFile.ExtractValue("/PvOnDc/Dc/Power"))
.NotNull()
.Average();
var average1HBatteryPower = validFiles
.Select(csvFile => csvFile.ExtractValue("/Battery/Dc/Power"))
.NotNull()
.Average();
Console.WriteLine($"SOC: {average1HSoc}");
Console.WriteLine($"PvPower: {average1HPvPower}");
Console.WriteLine($"Battery: {average1HBatteryPower}");
if (fileTimestamp >= oneHourBefore && fileTimestamp <= currentTimestamp)
{
Console.WriteLine("Check file created at "+ DateTimeOffset.FromUnixTimeSeconds(fileTimestamp).DateTime);
using var reader = new StreamReader(csvFile);
while (!reader.EndOfStream)
{
var line = reader.ReadLine();
var lines = line?.Split(';');
// Assuming there are always three columns (variable name and its value)
if (lines is { Length: 3 })
{
var variableName = lines[0].Trim();
if (TryParse(lines[1].Trim(), out var value))
{
// Check if variableValue is a valid number
if (IsSoc(variableName))
{
if (socAverage == 0)
{
socAverage = value;
}
else
{
socAverage = (socAverage + value) / 2;
}
}
if (IsPvPower(variableName))
{
if (pvPowerAverage == 0)
{
pvPowerAverage = value;
}
else
{
pvPowerAverage = (pvPowerAverage + value) / 2;
}
}
if (IsBatteryPower(variableName))
{
if (batteryPowerAverage == 0)
{
batteryPowerAverage = value;
}
else
{
batteryPowerAverage = (batteryPowerAverage + value) / 2;
}
}
}
else
{
// Handle cases where variableValue is not a valid number
//Console.WriteLine($"Invalid numeric value for variable {variableName}:{lines[1].Trim()}");
}
}
else
{
// Handle invalid column format
// Console.WriteLine("Invalid format in column");
}
}
}
} }
catch (Exception e)
// Print the stored CSV data for verification {
e.WriteLine();
Console.WriteLine($"SOC: {socAverage}"); }
Console.WriteLine($"PvPower: {pvPowerAverage}");
Console.WriteLine($"Battery: {batteryPowerAverage}");
Console.WriteLine("CSV data reading and storage completed."); Console.WriteLine("CSV data reading and storage completed.");
//Create a new file to folder "Hourly Aggregated Data and push it to S3" //Create a new file to folder "Hourly Aggregated Data and push it to S3"
Console.WriteLine("-----------------------------------------------------------------------------------------------------------------"); Console.WriteLine("-----------------------------------------------------------------------------------------------------------------");
//UploadAggregatedCsv();
}
} private static Double? ExtractValue(this String csvFile, String path)
// private static async Task<Boolean> UploadAggregatedCsv(StatusRecord status, DateTime timeStamp)
// {
// var s3Config = status.Config.S3;
// var csv = status.ToCsv().LogInfo();
// if (s3Config is null)
// return false;
//
// var s3Path = timeStamp.ToUnixTime() + ".csv";
// var request = s3Config.CreatePutRequest(s3Path);
// var response = await request.PutAsync(new StringContent(csv));
//
//
// if (response.StatusCode != 200)
// {
// Console.WriteLine("ERROR: PUT");
// var error = await response.GetStringAsync();
// Console.WriteLine(error);
// }
//
// return true;
// }
//
// Custom method to check if a string is numeric
private static bool IsSoc(string value)
{ {
return value == "/Battery/Soc"; return File
.ReadAllLines(csvFile)
.Select(l => l.Split(';'))
.Where(l => l.Length == 3)
.Where(line => line[0].Trim() == path)
.Select(l => Double.TryParse(l[1].Trim(), out var value)
? value
: (Double?) null)
.FirstOrDefault();
} }
private static bool IsPvPower(string value) private static Boolean IsFileWithinTimeRange(string filePath, long startTime, long endTime)
{ {
return value == "/PvOnDc/Dc/Power"; var fileTimestamp = long.TryParse(Path.GetFileNameWithoutExtension(filePath).Replace("log_", ""), out var fileTimestamp1) ? fileTimestamp1 : -1;
return fileTimestamp >= startTime && fileTimestamp < endTime;
} }
private static bool IsBatteryPower(string value)
{
return value == "/Battery/Dc/Power";
}
} }