Исправление логики вычислений

Author: MaxGog

Interfaces/INotificationService.cs

@@ -1,10 +1,8 @@
 namespace ParametricFunctionApp.Interfaces;
 public interface INotificationService
 {
-    Task ShowSuccessAsync(string message, string title = "Успешно");
-    Task ShowErrorAsync(string message, string title = "Ошибка");
+    Task ShowErrorAsync(string message);
+    Task ShowSuccessAsync(string message);
     Task ShowInfoAsync(string message, string title = "Информация");
-    Task<string> ShowPromptAsync(string title, string message, string accept = "OK", string cancel = "Отмена", 
-        string placeholder = "", int maxLength = -1, Keyboard keyboard = null);
-    Task<bool> ShowConfirmationAsync(string title, string message, string accept = "Да", string cancel = "Нет");
+    Task<string> ShowPromptAsync(string title, string message, string accept = "OK", string cancel = "Cancel", string placeholder = null, int maxLength = -1, Keyboard keyboard = null);
 }

Services/NotificationService.cs

@@ -5,36 +5,30 @@ namespace ParametricFunctionApp.Services;
 
 public class NotificationService : INotificationService
 {
-    private readonly Page _page;
+    private readonly ContentPage _page;
 
-    public NotificationService(Page page)
+    public NotificationService(ContentPage page)
     {
-        _page = page ?? throw new ArgumentNullException(nameof(page));
+        _page = page;
     }
 
-    public async Task ShowSuccessAsync(string message, string title = "Успешно")
+    public async Task ShowErrorAsync(string message)
     {
-        await _page.DisplayAlert(title, message, "OK");
+        await _page.DisplayAlert("Ошибка", message, "OK");
     }
 
-    public async Task ShowErrorAsync(string message, string title = "Ошибка")
+    public async Task ShowSuccessAsync(string message)
     {
-        await _page.DisplayAlert(title, message, "OK");
+        await _page.DisplayAlert("Успех", message, "OK");
     }
 
     public async Task ShowInfoAsync(string message, string title = "Информация")
     {
         await _page.DisplayAlert(title, message, "OK");
     }
 
-    public async Task<string> ShowPromptAsync(string title, string message, string accept = "OK", string cancel = "Отмена", 
-        string placeholder = "", int maxLength = -1, Keyboard keyboard = null)
+    public async Task<string> ShowPromptAsync(string title, string message, string accept = "OK", string cancel = "Cancel", string placeholder = null, int maxLength = -1, Keyboard keyboard = null)
     {
         return await _page.DisplayPromptAsync(title, message, accept, cancel, placeholder, maxLength, keyboard);
     }
-
-    public async Task<bool> ShowConfirmationAsync(string title, string message, string accept = "Да", string cancel = "Нет")
-    {
-        return await _page.DisplayAlert(title, message, accept, cancel);
-    }
 }

ViewModels/MainPageViewModel.cs

@@ -3,22 +3,21 @@
 using System.Runtime.CompilerServices;
 using ParametricFunctionApp.Models;
 using ParametricFunctionApp.Controls;
-using AudioUnit;
 using ParametricFunctionApp.Interfaces;
 
 namespace ParametricFunctionApp.ViewModels;
 
 public class MainPageViewModel : INotifyPropertyChanged
 {
     private readonly INotificationService _notificationService;
-    private double _enterK;
-    private double _kd;
-    private double _enterA;
-    private double _k1;
+    private double _coefficientK;
+    private double _stepCoefficient;
+    private double _parameterA;
+    private double _initialX;
     private bool _kSet = false;
     private bool _kdSet = false;
     private bool _aSet = false;
-    private bool _k1Set = false;
+    private bool _x1Set = false;
     private List<stRecursion> _recOut = new List<stRecursion>();
     private GraphDrawable _graphDrawable;
     private AppSettings _settings = new AppSettings();
@@ -34,54 +33,50 @@ public MainPageViewModel(INotificationService notificationService)
         PropertyChanged = delegate { };
     }
 
-    public double EnterK
+    public double CoefficientK
     {
-        get => _enterK;
+        get => _coefficientK;
         set
         {
-            if (SetProperty(ref _enterK, value))
+            if (SetProperty(ref _coefficientK, value))
             {
                 ValidateInputs();
-                OnPropertyChanged(nameof(EnterK));
             }
         }
     }
 
-    public double Kd
+    public double StepCoefficient
     {
-        get => _kd;
+        get => _stepCoefficient;
         set
         {
-            if (SetProperty(ref _kd, value))
+            if (SetProperty(ref _stepCoefficient, value))
             {
                 ValidateInputs();
-                OnPropertyChanged(nameof(Kd));
             }
         }
     }
 
-    public double EnterA
+    public double ParameterA
     {
-        get => _enterA;
+        get => _parameterA;
         set
         {
-            if (SetProperty(ref _enterA, value))
+            if (SetProperty(ref _parameterA, value))
             {
                 ValidateInputs();
-                OnPropertyChanged(nameof(EnterA));
             }
         }
     }
 
-    public double K1
+    public double InitialX
     {
-        get => _k1;
+        get => _initialX;
         set
         {
-            if (SetProperty(ref _k1, value))
+            if (SetProperty(ref _initialX, value))
             {
                 ValidateInputs();
-                OnPropertyChanged(nameof(K1));
             }
         }
     }
@@ -103,10 +98,11 @@ public bool ASet
         get => _aSet;
         set => SetProperty(ref _aSet, value);
     }
-    public bool K1Set
+
+    public bool X1Set
     {
-        get => _k1Set;
-        set => SetProperty(ref _k1Set, value);
+        get => _x1Set;
+        set => SetProperty(ref _x1Set, value);
     }
 
     public List<stRecursion> RecOut
@@ -142,36 +138,35 @@ public int PointsCount
             {
                 _settings.PointsCount = value;
                 ValidateInputs();
-                OnPropertyChanged(nameof(PointsCount));
             }
         }
     }
 
     public void ResetK()
     {
-        EnterK = 0;
+        CoefficientK = 0;
         KSet = false;
         ValidateInputs();
     }
 
     public void ResetKd()
     {
-        Kd = 0;
+        StepCoefficient = 0;
         KdSet = false;
         ValidateInputs();
     }
 
     public void ResetA()
     {
-        EnterA = 0;
+        ParameterA = 0;
         ASet = false;
         ValidateInputs();
     }
 
-    public void ResetK1()
+    public void ResetX1()
     {
-        K1 = 0;
-        K1Set = false;
+        InitialX = 0;
+        X1Set = false;
         ValidateInputs();
     }
 
@@ -183,7 +178,7 @@ public async Task<bool> SetKValueAsync(string input)
             return false;
         }
 
-        EnterK = Math.Round(value, 1);
+        CoefficientK = Math.Round(value, 1);
         KSet = true;
         return true;
     }
@@ -202,7 +197,7 @@ public async Task<bool> SetKdValueAsync(string input)
             return false;
         }
 
-        Kd = Math.Round(value, 1);
+        StepCoefficient = Math.Round(value, 1);
         KdSet = true;
         return true;
     }
@@ -215,21 +210,27 @@ public async Task<bool> SetAValueAsync(string input)
             return false;
         }
 
-        EnterA = Math.Round(value, 1);
+        if (value <= 0)
+        {
+            await _notificationService.ShowErrorAsync("Параметр A должен быть положительным числом");
+            return false;
+        }
+
+        ParameterA = Math.Round(value, 1);
         ASet = true;
         return true;
     }
 
-    public async Task<bool> SetK1ValueAsync(string input)
+    public async Task<bool> SetX1ValueAsync(string input)
     {
         if (!ValidateAndParseDouble(input, out double value))
         {
             await _notificationService.ShowErrorAsync("Введите числовое значение с максимум 1 знаком после запятой");
             return false;
         }
 
-        K1 = Math.Round(value, 1);
-        K1Set = true;
+        InitialX = Math.Round(value, 1);
+        X1Set = true;
         return true;
     }
 
@@ -243,7 +244,6 @@ await _notificationService.ShowInfoAsync(
             "О программе");
     }
 
-
     public bool ValidateAndParseDouble(string input, out double result)
     {
         input = input.Replace('.', ',');
@@ -270,7 +270,7 @@ private int GetDecimalPlaces(string numberString)
 
     public bool CanCalculate()
     {
-        return KSet && KdSet && !HasErrors && PointsCount > 0;
+        return KSet && KdSet && ASet && X1Set && !HasErrors && PointsCount > 0;
     }
 
     private void ValidateInputs()
@@ -285,37 +285,36 @@ private void ValidateInputs()
             return;
         }
 
-        if (ASet && EnterA <= 0)
+        if (ASet && ParameterA <= 0)
         {
             HasErrors = true;
             ErrorMessage = "Параметр A должен быть положительным числом (A > 0)";
             return;
         }
 
-        if (KSet && KdSet && ASet)
-        {            
-            if (Kd <= 0)
-            {
-                HasErrors = true;
-                ErrorMessage = "Шаг kd должен быть положительным числом (kd > 0)";
-                return;
-            }
-            
-            double x1 = EnterK * EnterA + K1;
-            double step = EnterA * Kd;
-            double lastX = x1 + (PointsCount - 1) * step;
+        if (KdSet && StepCoefficient <= 0)
+        {
+            HasErrors = true;
+            ErrorMessage = "Шаг kd должен быть положительным числом (kd > 0)";
+            return;
+        }
+
+        if (KSet && KdSet && ASet && X1Set)
+        {
+            double step = ParameterA * StepCoefficient;
+            double lastX = InitialX + (PointsCount - 1) * step;
 
-            if (lastX >= EnterA)
+            if (lastX >= ParameterA)
             {
                 HasErrors = true;
-                ErrorMessage = $"Ошибка: конечное значение x ({lastX:F1}) должно быть меньше A = {EnterA} (ограничение: x < A). Уменьшите количество точек N или шаг kd.";
+                ErrorMessage = $"Ошибка: конечное значение x ({lastX:F1}) должно быть меньше A = {ParameterA} (ограничение: x < A). Уменьшите количество точек N или шаг kd.";
                 return;
             }
 
-            if (x1 >= EnterA)
+            if (InitialX >= ParameterA)
             {
                 HasErrors = true;
-                ErrorMessage = $"Ошибка: начальное значение x ({x1:F1}) должно быть меньше A = {EnterA} (ограничение: x < A). Уменьшите коэффициент k.";
+                ErrorMessage = $"Ошибка: начальное значение x ({InitialX:F1}) должно быть меньше A = {ParameterA} (ограничение: x < A).";
                 return;
             }
         }
@@ -330,32 +329,33 @@ public void CalculateFunction()
 
         var newRecOut = new List<stRecursion>();
 
-        double boundary = EnterK * EnterA;
-        double step = EnterA * Kd;
-        double x = K1;
+        double boundary = CoefficientK * ParameterA;
+        double step = ParameterA * StepCoefficient;
+        double x = InitialX;
 
         for (int i = 0; i < PointsCount; i++)
         {
-            if (x >= EnterA)
+            if (x >= ParameterA)
             {
                 continue;
             }
 
             double y;
-
+            
             if (x < boundary)
-                y = EnterA * Math.Sqrt(Math.Abs(x + 2 * EnterA));
+                y = ParameterA * Math.Sqrt(Math.Abs(x + 2 * ParameterA));
             else
-                y = EnterA * Math.Cos(x + 1) + EnterA;
+                y = ParameterA * Math.Cos(x + 1) + ParameterA;
 
-            newRecOut.Add(new stRecursion(i + 1, x, y));
+            newRecOut.Add(new stRecursion(i + 1, Math.Round(x, 3), Math.Round(y, 3)));
             x += step;
         }
 
         RecOut = newRecOut;
         GraphDrawable.DataPoints = newRecOut;
         OnPropertyChanged(nameof(GraphDrawable));
     }
+
     public event PropertyChangedEventHandler? PropertyChanged;
 
     protected virtual void OnPropertyChanged([CallerMemberName] string? propertyName = null)

Views/MainPage.xaml

@@ -129,7 +129,7 @@
                             <Button Grid.Column="1"
                                 Grid.Row="1"
                                 Text="Ввести k1"
-                                Clicked="OnEnterK1Cliked"
+                                Clicked="OnEnterX1Clicked"
                                 Style="{StaticResource FluentButton}"/>
                         </Grid>
                     </VerticalStackLayout>