From 979e6328fb09bf30ea7e71affa9c37e50072f014 Mon Sep 17 00:00:00 2001 From: Markus Ewald Date: Thu, 31 May 2007 19:15:39 +0000 Subject: [PATCH] Fixed a warning resulting from an invalid character in an XML comment; renamed findBestPlacement() to tryFindBestPlacement() which is more in sync with the conventions used by the .NET framework git-svn-id: file:///srv/devel/repo-conversion/nusu@28 d2e56fa2-650e-0410-a79f-9358c0239efd --- Nuclex.Support (PC).csproj | 5 ++++- Source/Packing/CygonRectanglePacker.cs | 5 +++-- Source/Packing/RectanglePacker.Test.cs | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Nuclex.Support (PC).csproj b/Nuclex.Support (PC).csproj index e4c7929..5b66e65 100644 --- a/Nuclex.Support (PC).csproj +++ b/Nuclex.Support (PC).csproj @@ -103,7 +103,10 @@ false RingMemoryStream - + + false + AssemblyInfo + false RingMemoryStream.Test diff --git a/Source/Packing/CygonRectanglePacker.cs b/Source/Packing/CygonRectanglePacker.cs index 0acdadd..ef8dc37 100644 --- a/Source/Packing/CygonRectanglePacker.cs +++ b/Source/Packing/CygonRectanglePacker.cs @@ -97,7 +97,7 @@ namespace Nuclex.Support.Packing { } // Determine the placement for the new rectangle - bool fits = findBestPlacement(rectangleWidth, rectangleHeight, out placement); + bool fits = tryFindBestPlacement(rectangleWidth, rectangleHeight, out placement); // If a place for the rectangle could be found, update the height slice table to // mark the region of the rectangle as being taken. @@ -110,8 +110,9 @@ namespace Nuclex.Support.Packing { /// Finds the best position for a rectangle of the given width /// Width of the rectangle to find a position for /// Height of the rectangle to find a position for + /// Received the best placement found for the rectangle /// The best position for a rectangle of the specified dimensions - private bool findBestPlacement( + private bool tryFindBestPlacement( int rectangleWidth, int rectangleHeight, out Point placement ) { diff --git a/Source/Packing/RectanglePacker.Test.cs b/Source/Packing/RectanglePacker.Test.cs index 2cf99ef..91395c9 100644 --- a/Source/Packing/RectanglePacker.Test.cs +++ b/Source/Packing/RectanglePacker.Test.cs @@ -37,7 +37,7 @@ namespace Nuclex.Support.Packing { /// /// A perfect packer would achieve an efficiency rating of 1.0. This is /// impossible however since the 24 squares cannot all be packed into - /// the 70x70 square with no overlap (Bitner & Reingold 1975). The closer + /// the 70x70 square with no overlap (Bitner & Reingold 1975). The closer /// the efficiency rating is to 1.0, the better, with 0.99 being the /// mathematically best rating achievable. ///