From c9059f6df3e6b96390add573bbcb961148f800ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD?= Date: Wed, 17 Sep 2025 12:59:21 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20nullable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/TcpClient.cs | 1 + Domain/Data.cs | 24 ++++++++++++------------ Domain/Dto/JsonData.cs | 24 ++++++++++++------------ Domain/Dto/MessagePackData.cs | 24 ++++++++++++------------ Server/DataGenerator.cs | 24 ++++++++++++------------ 5 files changed, 49 insertions(+), 48 deletions(-) diff --git a/Client/TcpClient.cs b/Client/TcpClient.cs index 5a93a66..888c435 100644 --- a/Client/TcpClient.cs +++ b/Client/TcpClient.cs @@ -123,6 +123,7 @@ public class TcpClientWrapper : IClient Console.WriteLine($"Error: {ex.Message}"); } } + System.Console.WriteLine("End cycle"); } } diff --git a/Domain/Data.cs b/Domain/Data.cs index a0918eb..65ccbcc 100644 --- a/Domain/Data.cs +++ b/Domain/Data.cs @@ -1,17 +1,17 @@ namespace Domain; public record class Data( - double ConcentrationIndex, - double RelaxationIndex, - double CognitiveControl, - double CognitiveLoad, - double Alpha, - double Beta, - double Theta, - double Smr, - double MuWave, - bool Artifact, - double SignalQuality, + double? ConcentrationIndex, + double? RelaxationIndex, + double? CognitiveControl, + double? CognitiveLoad, + double? Alpha, + double? Beta, + double? Theta, + double? Smr, + double? MuWave, + bool? Artifact, + double? SignalQuality, long PackageIndex, - DateTime TimeOfDataGenerate + DateTime? TimeOfDataGenerate ); \ No newline at end of file diff --git a/Domain/Dto/JsonData.cs b/Domain/Dto/JsonData.cs index 6aeae46..4e2a30a 100644 --- a/Domain/Dto/JsonData.cs +++ b/Domain/Dto/JsonData.cs @@ -5,31 +5,31 @@ using System.Text.Json.Serialization; public class JsonData { [JsonPropertyName("concentrationIndex")] - public double ConcentrationIndex { get; set; } + public double? ConcentrationIndex { get; set; } [JsonPropertyName("relaxationIndex")] - public double RelaxationIndex { get; set; } + public double? RelaxationIndex { get; set; } [JsonPropertyName("cognitiveControl")] - public double CognitiveControl { get; set; } + public double? CognitiveControl { get; set; } [JsonPropertyName("cognitiveLoad")] - public double CognitiveLoad { get; set; } + public double? CognitiveLoad { get; set; } [JsonPropertyName("alpha")] - public double Alpha { get; set; } + public double? Alpha { get; set; } [JsonPropertyName("beta")] - public double Beta { get; set; } + public double? Beta { get; set; } [JsonPropertyName("theta")] - public double Theta { get; set; } + public double? Theta { get; set; } [JsonPropertyName("smr")] - public double Smr { get; set; } + public double? Smr { get; set; } [JsonPropertyName("muWave")] - public double MuWave { get; set; } + public double? MuWave { get; set; } [JsonPropertyName("artifact")] - public bool Artifact { get; set; } + public bool? Artifact { get; set; } [JsonPropertyName("signalQuality")] - public double SignalQuality { get; set; } + public double? SignalQuality { get; set; } [JsonPropertyName("packageIndex")] public long PackageIndex { get; set; } [JsonPropertyName("timeOfDataGenerate")] - public DateTime TimeOfDataGenerate { get; set; } + public DateTime? TimeOfDataGenerate { get; set; } public JsonData() { } diff --git a/Domain/Dto/MessagePackData.cs b/Domain/Dto/MessagePackData.cs index 054d086..55e4aab 100644 --- a/Domain/Dto/MessagePackData.cs +++ b/Domain/Dto/MessagePackData.cs @@ -6,31 +6,31 @@ using MessagePack; public class MessagePackData { [Key("concentrationIndex")] - public double ConcentrationIndex { get; set; } + public double? ConcentrationIndex { get; set; } [Key("relaxationIndex")] - public double RelaxationIndex { get; set; } + public double? RelaxationIndex { get; set; } [Key("cognitiveControl")] - public double CognitiveControl { get; set; } + public double? CognitiveControl { get; set; } [Key("cognitiveLoad")] - public double CognitiveLoad { get; set; } + public double? CognitiveLoad { get; set; } [Key("alpha")] - public double Alpha { get; set; } + public double? Alpha { get; set; } [Key("beta")] - public double Beta { get; set; } + public double? Beta { get; set; } [Key("theta")] - public double Theta { get; set; } + public double? Theta { get; set; } [Key("smr")] - public double Smr { get; set; } + public double? Smr { get; set; } [Key("muWave")] - public double MuWave { get; set; } + public double? MuWave { get; set; } [Key("artifact")] - public bool Artifact { get; set; } + public bool? Artifact { get; set; } [Key("signalQuality")] - public double SignalQuality { get; set; } + public double? SignalQuality { get; set; } [Key("packageIndex")] public long PackageIndex { get; set; } [Key("timeOfDataGenerate")] - public DateTime TimeOfDataGenerate { get; set; } + public DateTime? TimeOfDataGenerate { get; set; } public MessagePackData() { } diff --git a/Server/DataGenerator.cs b/Server/DataGenerator.cs index 56f9166..3258c4e 100644 --- a/Server/DataGenerator.cs +++ b/Server/DataGenerator.cs @@ -70,19 +70,19 @@ public class DataGenerator var signalQuality = _random.NextDouble(); return new Data( - ConcentrationIndex: _random.NextDouble(), - RelaxationIndex: _random.NextDouble(), - CognitiveControl: _random.NextDouble(), - CognitiveLoad: _random.NextDouble(), - Alpha: alpha, - Beta: beta, - Theta: theta, - Smr: _random.NextDouble(), - MuWave: _random.NextDouble(), - Artifact: signalQuality < 0.5, - SignalQuality: signalQuality, + ConcentrationIndex: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + RelaxationIndex: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + CognitiveControl: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + CognitiveLoad: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + Alpha: _random.NextDouble() < 0.1 ? null : alpha, + Beta: _random.NextDouble() < 0.1 ? null : beta, + Theta: _random.NextDouble() < 0.1 ? null : theta, + Smr: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + MuWave: _random.NextDouble() < 0.1 ? null : _random.NextDouble(), + Artifact: _random.NextDouble() < 0.1 ? null : signalQuality < 0.5, + SignalQuality: _random.NextDouble() < 0.1 ? null : signalQuality, PackageIndex: packageNumber, - TimeOfDataGenerate: DateTime.Now + TimeOfDataGenerate: _random.NextDouble() < 0.1 ? null : DateTime.Now ); } } \ No newline at end of file