ElEgEv/PIbd-21_Eliseev_E.E._Airbus_Base
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Eliseev E.E. LabWork08 #9

Closed
ElEgEv wants to merge 8 commits from LabWork08 into LabWork07
pull from: LabWork08
merge into: ElEgEv:LabWork07
Conversation 0 Commits 8 Files Changed 10 +11 -1
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5f6a04152 - Show all commits

10
Airbus/Airbus/PlaneCompareByColor.cs
View File

@ -43,6 +43,16 @@ namespace Airbus
return 1;
}
if(xPlane.GetPlane.Airbus.Speed != yPlane.GetPlane.Airbus.Speed)
{
return 1;
}
if (xPlane.GetPlane.Airbus.Weight != yPlane.GetPlane.Airbus.Weight)
{
return 1;
}
var xEntity = xPlane.GetPlane.Airbus;
var yEntity = yPlane.GetPlane.Airbus;
var colorCompare = xEntity.CorpusColor.Name.CompareTo(yEntity.CorpusColor.Name);

2
Airbus/Airbus/PlaneCompareByType.cs
View File

@ -61,7 +61,7 @@ namespace Airbus
return speedCompare;
}
return xPlane.GetPlane.Airbus.Speed.CompareTo(yPlane.GetPlane.Airbus.Speed);
return xPlane.GetPlane.Airbus.Weight.CompareTo(yPlane.GetPlane.Airbus.Weight);
}
}
}