Разрешены конфликты

HoistingCrane/HoistingCrane/CollectionGenericObjects/AbstractCompany.cs

@@ -1,5 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
 namespace HoistingCrane.CollectionGenericObjects
 {
     public abstract class AbstractCompany
@@ -31,7 +30,7 @@ namespace HoistingCrane.CollectionGenericObjects
         {
             get
             {
-                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth);
+                return (pictureWidth * pictureHeight) / (_placeSizeHeight * _placeSizeWidth)-3;
             }
         }
         public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects<DrawningTrackedVehicle> array)
@@ -75,7 +74,6 @@ namespace HoistingCrane.CollectionGenericObjects
             }
             return bitmap;
         }
-
         /// <summary>
         /// Вывод заднего фона
         /// </summary>

HoistingCrane/HoistingCrane/CollectionGenericObjects/Garage.cs

@@ -1,7 +1,4 @@
 using HoistingCrane.Drawning;
-using System;
-using System.Collections.Specialized;
-
 namespace HoistingCrane.CollectionGenericObjects
 {
     public class Garage : AbstractCompany
@@ -53,5 +50,6 @@ namespace HoistingCrane.CollectionGenericObjects
 
             }
         }
+
     }
 }

HoistingCrane/HoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs

@@ -1,5 +1,4 @@
-using System;
+namespace HoistingCrane.CollectionGenericObjects
-namespace HoistingCrane.CollectionGenericObjects
 {
     public interface ICollectionGenericObjects<T>
         where T: class

HoistingCrane/HoistingCrane/CollectionGenericObjects/MassivGenericObjects.cs

@@ -31,7 +31,7 @@ namespace HoistingCrane.CollectionGenericObjects
         }
         public T? Get(int position)
         {
-            if(position >= 0 && position < arr.Length)
+            if (position >= 0 && position < arr.Length)
             {
                 return arr[position];
             }

HoistingCrane/HoistingCrane/MovementStrategy/AbstractStrategy.cs

@@ -47,7 +47,6 @@
             FieldWidth = width;
             FieldHeight = height;
         }
-
         /// <summary>
         /// Шаг перемещения
         /// </summary>
@@ -119,7 +118,6 @@
         /// </summary>
         /// <returns></returns>
         protected abstract bool IsTargetDestination();
-
         /// <summary>
         /// Попытка перемещения в требуемом направлении
         /// </summary>

HoistingCrane/HoistingCrane/MovementStrategy/MoveToBorder.cs

@@ -1,4 +1,6 @@
-namespace HoistingCrane.MovementStrategy
+using System.Configuration;
+
+namespace HoistingCrane.MovementStrategy
 {
     public class MoveToBorder : AbstractStrategy
     {
@@ -12,7 +14,6 @@
 
             return objParams.RightBorder + GetStep() >= FieldWidth && objParams.DownBorder + GetStep() >= FieldHeight;
         }
-
         protected override void MoveToTarget()
         {
             ObjectParameters? objParams = GetObjectParameters;