Головнев Максим by maximka200 · Pull Request #270 · kontur-courses/tdd

maximka200 · 2025-11-27T10:01:09Z

No description provided.

- написал основную структуру логику CircularCloudLayouter и Spiral

maximka200 · 2025-11-28T11:43:20Z

cs/TagsCloudVisualization/Spiral.cs

+        const double radiusStep = 1.0;  
+
+        angle += angleStep;
+        var radius = radiusStep * angle;


Dimques · 2025-11-29T05:53:41Z

cs/TagsCloudVisualization/Spiral.cs

+    }
+
+    private bool IntersectsWithAny(Rectangle rect) =>
+        Rectangles.Any(r => r.IntersectsWith(rect));


Будет очень дорого, если будет, например, много мелких квадратов. Попробуй эвристику похитрее придумать. Или посмотри в сторону геометрических алгоритмов.

cs/TagsCloudVisualization/Spiral.cs

+
+namespace TagCloud;
+
+public class Spiral(Point center)


cs/TagsCloudVisualization/Spiral.cs

+    private bool IntersectsWithAny(Rectangle rect) =>
+        Rectangles.Any(r => r.IntersectsWith(rect));
+
+    private Rectangle MoveToCenter(Rectangle rect)


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    public Rectangle PutNextRectangle(Size rectangleSize)
+    {
+        if (rectangleSize.Width <= 0 || rectangleSize.Height <= 0)
+            throw new ArgumentException("Размер прямоугольника должен быть положительным");


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+
+namespace TagCloud;
+
+public class CircularCloudLayouter(Point center)


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+        if (rectangleSize.Width <= 0 || rectangleSize.Height <= 0)
+            throw new ArgumentException("Размер прямоугольника должен быть положительным");
+
+        return RectangleSpiral.TryAddRectangleInCenter(rectangleSize, out var rectangle)


cs/TagsCloudVisualization/Spiral.cs

+
+    public Rectangle AddRectangle(Size rectangleSize)
+    {
+        while (true)


cs/TagsCloudVisualization/Spiral.cs

+        return false;
+    }
+
+    #region Helpers


cs/tdd.sln

 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Samples\Samples.csproj", "{B5108E20-2ACF-4ED9-84FE-2A718050FC94}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TagsCloudVisualization", "TagsCloudVisualization\TagsCloudVisualization.csproj", "{6580A616-7832-45F4-8A9A-E9A5D4FE64A8}"


- доп. проект с примерами использования библиотеки - визуализация упавших тестов - переделал логику

maximka200 · 2025-12-01T21:43:33Z

cs/TagsCloudVisualization/CircularCloudLayouter.cs

@@ -0,0 +1,129 @@
+using System.Drawing;
+using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;


у меня ломается почему то

Вроде бы без этого работает

а, все понял о чем ты

cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    private readonly List<Rectangle> rectangles = [];
+    public IReadOnlyCollection<Rectangle> Rectangles => rectangles.AsReadOnly();
+
+    private int failureStreak;


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    private int failureStreak;
+    private int currentStep = DefaultStep;
+
+    private const int DefaultStep = 1;


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    public IReadOnlyCollection<Rectangle> Rectangles => rectangles.AsReadOnly();
+
+    private int failureStreak;
+    private int currentStep = DefaultStep;


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+        }
+    }
+
+    private Rectangle MoveAtTheWay(Rectangle rectangle, int dx, int dy, bool toCenter, int maxStep)


cs/TagsCloudVisualizationTests/CircularCloudLayouterTests.cs

+
+        var boundingWidth = maxX - minX;
+        var boundingHeight = maxY - minY;
+        var boundingArea = (double)boundingWidth * boundingHeight;


cs/TagsCloudVisualizationTests/CircularCloudLayouterTests.cs

+    [SetUp]
+    public void Setup()
+    {
+        center = new Point(0, 0);


Dimques · 2025-12-01T16:18:56Z

cs/TagsCloudVisualizationTests/CloudVisualizationConfigBuilderTests.cs

+namespace TagCloudTests;
+
+[TestFixture]
+public class CloudVisualizationConfigBuilderTests


Хвалю за попытку хорошо сделать, но кажется, что тесты на билдер излишни - как-будто присваивание в этих тестах проверяешь, не? :)

cs/TagsCloudVisualizationTests/CloudVisualizerTests.cs

+    }
+
+    [Test]
+    public void ConfigIsNull_ShouldThrowArgumentNullException()


cs/TagsCloudVisualizationTests/SpiralTests.cs

+    }
+
+    [Test]
+    public void GetNextPoint_ShouldReturnDifferentPoints()


cs/TagsCloudVisualization/CircularCloudLayouter.cs

+        return Math.Sqrt(halfW * halfW + halfH * halfH);
+    }
+
+    private static bool CirclesIntersect(Point c1, double r1, Point c2, double r2)


Dimques · 2025-12-02T15:30:37Z

cs/TagsCloudVisualization/CircularCloudLayouter.cs

+            var distX = Math.Abs(center.X - shiftedCenter.X);
+            var distY = Math.Abs(center.Y - shiftedCenter.Y);
+
+            if (dx != 0 && distX >= bestDistX ||


В строчку норм будет смотреться

cs/TagsCloudVisualization/CircularCloudLayouter.cs

+            };
+
+            var shiftedCenter = GetCenter(shifted);
+            var distX = Math.Abs(center.X - shiftedCenter.X);


Dimques · 2025-12-02T15:33:10Z

cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    private Rectangle FindBestPositionWithExponentialStep(Rectangle rectangle, int dx, int dy)
+    {
+        var best = rectangle;
+        var bestCenter = GetCenter(best);


Хороший кандидат на метод-расширение для Rectangle.

не очень удобно его выносить, т.к. завязан на внутренних методах и некоторых полях

cs/TagsCloudVisualization/CircularCloudLayouter.cs

+    private void AddRectangle(Rectangle rect)
+    {
+        rectangles.Add(rect);
+        var c = GetCenter(rect);


cs/TagsCloudVisualization/Spiral.cs

+    {
+        placementFailureStreak++;
+
+        currentAngleStepMultiplier =


cs/TagsCloudVisualizationTests/CircularCloudLayouterTests.cs

+    [Repeat(100)]
+    public void PutNextRectangle_CloudForManyRectangles_ShouldBeDense()
+    {
+        var random = new Random(42);


Dimques · 2025-12-02T15:54:13Z

cs/TagsCloudVisualization/Visualisation/CloudVisualizationConfigBuilder.cs

+        return this;
+    }
+
+    public CloudVisualizationConfigBuilder WithBackground(Rgba32 color)


Никогда, никогда, никогда, НИКОГДА в публичных методах своих интерфейсов НЕ ИСПОЛЬЗУЙ ТИПЫ ИЗ БИБЛИОТЕК-ЗАВИСИМОСТЕЙ! Во-первых, если пользователь на них завяжется, то ты не сможешь сменить библиотеку для отрисовки под капотом у конфиг-билдера без поломки обратной совместимости с кодом пользователя, а во-вторых если он тоже использует ту же зависимость, но другой версии, могут быть очень дурацкие конфликты с зависимостями. В целом нюгет неплохо их разрешает, но всё-равно от пользователя надо стараться прятать транзитивные зависимости, для этого есть специальные инструкции в *.csproj файлах - если интересно, гугли про PrivateAssets и другие похожие инструкции.

maximka200 added 2 commits November 27, 2025 14:42

- написал основные тесты

451e210

- написал основную структуру логику CircularCloudLayouter и Spiral

- переименовал проект

21afe29

- sln файл

5b109ef

Dimques suggested changes Nov 29, 2025

View reviewed changes

maximka200 added 4 commits November 29, 2025 14:54

- добавил проект для теста ImageSharp

e0b63b9

- написал тесты

130322f

- доп. проект с примерами использования библиотеки - визуализация упавших тестов - переделал логику

- поправил проект с примерами

20431e9

- дописал тестов на конфиг-билдер

a14ecf7

Dimques suggested changes Dec 1, 2025

View reviewed changes

- внес правки

563bbbe

Dimques reviewed Dec 2, 2025

View reviewed changes

cs/TagsCloudVisualization/CircularCloudLayouter.cs

return Math.Sqrt(halfW * halfW + halfH * halfH);

}

private static bool CirclesIntersect(Point c1, double r1, Point c2, double r2)

This comment was marked as resolved.

Sign in to view

Dimques reviewed Dec 2, 2025

View reviewed changes

cs/TagsCloudVisualization/CircularCloudLayouter.cs Outdated

};

var shiftedCenter = GetCenter(shifted);

var distX = Math.Abs(center.X - shiftedCenter.X);

This comment was marked as resolved.

Sign in to view

Dimques reviewed Dec 2, 2025

View reviewed changes

cs/TagsCloudVisualization/CircularCloudLayouter.cs Outdated

private void AddRectangle(Rectangle rect)

{

rectangles.Add(rect);

var c = GetCenter(rect);

This comment was marked as resolved.

Sign in to view

Dimques reviewed Dec 2, 2025

View reviewed changes

cs/TagsCloudVisualization/Spiral.cs Outdated

{

placementFailureStreak++;

currentAngleStepMultiplier =

This comment was marked as resolved.

Sign in to view

Dimques reviewed Dec 2, 2025

View reviewed changes

cs/TagsCloudVisualizationTests/CircularCloudLayouterTests.cs

[Repeat(100)]

public void PutNextRectangle_CloudForManyRectangles_ShouldBeDense()

{

var random = new Random(42);

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

Dimques reviewed Dec 2, 2025

View reviewed changes

- поправил зависимость в конфиг билдере от внешней библиотеки цветов

edee444

maximka200 force-pushed the TagCloud branch from b9c5313 to edee444 Compare December 2, 2025 16:41

maximka200 added 2 commits December 2, 2025 21:48

- переписал тест на кучность

e0a837c

- вынес хелперы

bea0b48


		namespace TagCloud;

		public class CircularCloudLayouter(Point center)

		@@ -0,0 +1,129 @@
		using System.Drawing;
		using ArgumentOutOfRangeException = System.ArgumentOutOfRangeException;

Conversation

maximka200 commented Nov 27, 2025

Uh oh!

maximka200 commented Nov 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

This comment was marked as resolved.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

maximka200 commented Nov 28, 2025 •

edited

Loading