From e7a465ae9d1c8566a08c2b8352b4bf74ce3c86ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BD=D1=82=D0=BE=D0=BD=20=D0=9A=D1=83=D0=B4=D1=80?=
=?UTF-8?q?=D1=8F=D1=88=D0=BE=D0=B2?= <qubabox@mail.ru>
Date: Fri, 25 Nov 2016 15:15:48 +0300
Subject: [PATCH] - fixed SpectificCoordinates - removed useless checking
---
Mes_Wind_console/Program.cs | 2 +-
WindStressPRM/DTO/Output.cs | 2 +-
WindStressPRM/Utils/Matrix.cs | 4 ++--
WindStressPRM/WindStressPRM.cs | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Mes_Wind_console/Program.cs b/Mes_Wind_console/Program.cs
index db1f091..18e295a 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 ae5d1c7..8d76305 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 e01281a..a4677bc 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 aef8b4c..99f8551 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
--
GitLab