diff --git a/Mes_Wind_console/Program.cs b/Mes_Wind_console/Program.cs index db1f09157ef28f95ea5d2d2323794624b11becd2..18e295a17bb07dab0f0ca6e040a099933b21e5f9 100644 --- a/Mes_Wind_console/Program.cs +++ b/Mes_Wind_console/Program.cs @@ -108,7 +108,7 @@ namespace Mes_Wind_console Console.WriteLine("disabled station identifier is {0}", station.Identifier); } - foreach (var coordinate in output.SpectificCoordinates) // TODO: Название Output.Spectific -> Specific ? + foreach (var coordinate in output.SpecificCoordinates) // TODO: Название Output.Spectific -> Specific ? { Console.WriteLine("in coordinate ({0}; {1}) 35kV and less could be broken", coordinate.X, coordinate.Y); } diff --git a/WindStressPRM/DTO/Output.cs b/WindStressPRM/DTO/Output.cs index ae5d1c78977c2d9036c4ad9f63bf4bf90aa18a08..8d7630564160837b40ba7705ac87668098172c76 100644 --- a/WindStressPRM/DTO/Output.cs +++ b/WindStressPRM/DTO/Output.cs @@ -24,6 +24,6 @@ namespace WindStressPRM /// specific coordinates in which probable break of 35 kV powerlines may occure, checked on regular grid /// список точек с возможной поломкой ЛЭП меньше 35кВ с регулярной сетки /// </summary> - public List<Coordinate> SpectificCoordinates { get; set; } + public List<Coordinate> SpecificCoordinates { get; set; } } } diff --git a/WindStressPRM/Utils/Matrix.cs b/WindStressPRM/Utils/Matrix.cs index e01281a4d084a12883954662f1c97d955aa9e4e8..a4677bccd57e1402a5b0f16f9cbc15c0697dfcc8 100644 --- a/WindStressPRM/Utils/Matrix.cs +++ b/WindStressPRM/Utils/Matrix.cs @@ -53,7 +53,7 @@ namespace WindStressPRM /// <returns></returns> public int RowsCount() { - return Cells.Rank > 0 ? Cells.GetLength(0) : 0; + return Cells.GetLength(0); } /// <summary> /// Number of columns @@ -61,7 +61,7 @@ namespace WindStressPRM /// <returns></returns> public int ColumnCount() { - return Cells.Rank > 1 ? Cells.GetLength(1) : 0; + return Cells.GetLength(1); } } } diff --git a/WindStressPRM/WindStressPRM.cs b/WindStressPRM/WindStressPRM.cs index aef8b4c2c2f8781f4a2b34311b0f635d0d46d3bf..99f8551cd35ea20bb8e46f5b2dead9dae65c94b0 100644 --- a/WindStressPRM/WindStressPRM.cs +++ b/WindStressPRM/WindStressPRM.cs @@ -38,7 +38,7 @@ namespace WindStressPRM output.DisabledStations = new List<PowerStation>(); output.DisabledLines = new List<Powerline>(); output.DisabledLines = prmBrokenLines; - output.SpectificCoordinates = CheckSpecificLines(); + output.SpecificCoordinates = CheckSpecificLines(); foreach (PowerStation powerStation in input.PowerStations) { //stations of type pole can be disabled if the line is broken