From f80e3c221539ace9fd5721a27d6b3f7271c85bdf Mon Sep 17 00:00:00 2001 From: VictoriaPresnyakova Date: Sun, 4 Dec 2022 16:43:48 +0400 Subject: [PATCH] =?UTF-8?q?BoatCompareByColor=20=D1=81=D0=BE=D0=B7=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Catamaran/App.config | 60 +++++++++++------------ Catamaran/BoatCompareByColor.cs | 12 +++++ Catamaran/BoatCompareByType.cs | 4 +- Catamaran/Catamaran.csproj | 2 +- Catamaran/Properties/Settings.Designer.cs | 2 +- 5 files changed, 46 insertions(+), 34 deletions(-) create mode 100644 Catamaran/BoatCompareByColor.cs diff --git a/Catamaran/App.config b/Catamaran/App.config index 886bf17..bf7598f 100644 --- a/Catamaran/App.config +++ b/Catamaran/App.config @@ -1,65 +1,65 @@ - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/Catamaran/BoatCompareByColor.cs b/Catamaran/BoatCompareByColor.cs new file mode 100644 index 0000000..94a2e57 --- /dev/null +++ b/Catamaran/BoatCompareByColor.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Catamaran +{ + internal class BoatCompareByColor + { + } +} diff --git a/Catamaran/BoatCompareByType.cs b/Catamaran/BoatCompareByType.cs index 86cefc1..dfa0160 100644 --- a/Catamaran/BoatCompareByType.cs +++ b/Catamaran/BoatCompareByType.cs @@ -45,12 +45,12 @@ namespace Catamaran return 1; } var speedCompare = - xBoat.GetBoat.Boat.Speed.CompareTo(yBoat.GetBoat.Boat.Speed); + xBoat.GetBoat.Catamaran.Speed.CompareTo(yBoat.GetBoat.Catamaran.Speed); if (speedCompare != 0) { return speedCompare; } - return xBoat.GetBoat.Boat.Weight.CompareTo(yBoat.GetBoat.Boat.Weight); + return xBoat.GetBoat.Catamaran.Weight.CompareTo(yBoat.GetBoat.Catamaran.Weight); } } } diff --git a/Catamaran/Catamaran.csproj b/Catamaran/Catamaran.csproj index 64e7d18..98665cd 100644 --- a/Catamaran/Catamaran.csproj +++ b/Catamaran/Catamaran.csproj @@ -8,7 +8,7 @@ WinExe Catamaran Catamaran - v4.8 + v4.7.2 512 true true diff --git a/Catamaran/Properties/Settings.Designer.cs b/Catamaran/Properties/Settings.Designer.cs index 90ae974..886e125 100644 --- a/Catamaran/Properties/Settings.Designer.cs +++ b/Catamaran/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Catamaran.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.0.3.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));