Яценко Ирина

README.md

@@ -1,3 +1,6 @@
+
+![Getting Started](./TEST.png)
+
 # Dependency Injection Container
 
 DI-контейнеры используется во многих команд Контура для управления зависимостями с соблюдением Dependency Inversion Principle.
@@ -32,4 +35,4 @@ DI-контейнеры используется во многих команд
 Найди в своем проекте интересные места, которые сильно расходятся с идеями из видеолекций. Либо наоборот иллюстрируют и дополняют эти   идеи. Обрати внимание на:
     - Нарушение явного управления зависимостями / Dependency Injection. Чем это было обосновано, какую выгоду получили?
     - Активное, нестандартное, хитрое использование DI-контейнера. Чему могли бы научиться на этом примере другие?
-    - Проекты, в которых есть сборка сложного графа зависимостей, но DI-контейнера нет. Почему нет? Есть ли причины его не использовать?
+    - Проекты, в которых есть сборка сложного графа зависимостей, но DI-контейнера нет. Почему нет? Есть ли причины его не использовать?

TagCloudGenerator/ITextProcessor.cs

@@ -0,0 +1,7 @@
+namespace TagCloudGenerator
+{
+    public interface ITextProcessor
+    {
+        string[] ProcessText(string[] file);
+    }
+}

TagCloudGenerator/Program.cs

@@ -0,0 +1,17 @@
+using CommandLine;
+using TagCloudGenerator;
+
+public class Program
+{
+    static TagCloudDrawer tagCloudDrawer = new TagCloudDrawer();
+    public class Options
+    {
+        [Option('p', "path", Required = true, HelpText = "The path for the text file.")]
+        public string Path { get; set; }
+    }
+    public static void Main(string[] args)
+    {
+        Parser.Default.ParseArguments<Options>(args)
+                   .WithParsed<Options>(o => tagCloudDrawer.DrawWordsCloud(o.Path));
+    }
+}

TagCloudGenerator/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "TagCloudGenerator": {
+      "commandName": "Project",
+      "commandLineArgs": "-p \"C:\\Users\\lholy\\Documents\\GitHub\\di\\TagCloudGeneratorTest\\TestsData\\test3.txt\""
+    }
+  }
+}

TagCloudGenerator/TagCloudDrawer.cs

@@ -0,0 +1,54 @@
+using System.Drawing;
+using TagsCloudVisualization.PointDistributors;
+using TagsCloudVisualization;
+using System.Reflection;
+
+namespace TagCloudGenerator
+{
+    public class TagCloudDrawer
+    {
+        public VisualizingSettings settings;
+        public void DrawWordsCloud(string filePath)
+        {
+            var tagCloudDrawer = new TagCloudDrawer();
+
+            var words = ReadTextFromFile(filePath);           
+            tagCloudDrawer.Draw(words);
+
+            Console.WriteLine($"The tag cloud is drawn, the path to the image: {Path.GetDirectoryName(Assembly.GetExecutingAssembly().CodeBase)}");
+        }
+
+        private string[] ReadTextFromFile(string filePath)
+        {
+            TextProcessor textProcessor = new TextProcessor();
+
+            var text = File.ReadAllLines(filePath);
+            return textProcessor.ProcessText(text);
+        }
+
+        private void Draw(string[] text)
+        {
+            var center = new Point(500, 500);
+            var distributor = new Spiral(1,center, 0.1);
+            var layouter = new CircularCloudLayouter(center, distributor);
+            var brush = new SolidBrush(Color.Aqua);
+            var font = new Font("Arial", 24);
+
+            var bitmap = new Bitmap(1000, 1000);
+            var graphics = Graphics.FromImage(bitmap);
+
+            for (var i = 0; i < text.Length; i++)
+            {
+                SizeF size = graphics.MeasureString(text[i], font);
+                var rect = layouter.PutNextRectangle(size.ToSize());
+
+                if (i == 0 )
+                    distributor.centerOnPoint = true;
+
+                graphics.DrawString(text[i], font, brush, rect.X, rect.Y);
+            }
+
+            bitmap.Save("Test33.png");
+        }
+    }
+}

TagCloudGenerator/TagCloudGenerator.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="NuGet.CommandLine" Version="6.8.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="WeCantSpell.Hunspell" Version="5.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TagsCloudVisualization\TagsCloudVisualization.csproj" />
+  </ItemGroup>
+
+</Project>

TagCloudGenerator/TextProcessor.cs

@@ -0,0 +1,15 @@
+namespace TagCloudGenerator
+{
+    public class TextProcessor : ITextProcessor
+    {
+        public string[] ProcessText(string[] file)
+        {
+            for (var i = 0; i < file.Length; i++)
+            {             
+                file[i] = file[i].ToLower();
+            }
+
+            return file;
+        }
+    }
+}

TagCloudGenerator/TextProcessorWrapper.cs

@@ -0,0 +1,16 @@
+namespace TagCloudGenerator
+{
+    public abstract class TextProcessorWrapper : ITextProcessor
+    {
+        protected readonly ITextProcessor textProcessor;
+        public TextProcessorWrapper(ITextProcessor textProcessor) 
+        { 
+            this.textProcessor = textProcessor; 
+        }
+
+        public virtual string[] ProcessText(string[] file)
+        {
+           return textProcessor.ProcessText(file);
+        }  
+    }
+}

TagCloudGenerator/WordCounter.cs

@@ -0,0 +1,21 @@
+namespace TagCloudGenerator
+{
+    public class WordCounter
+    {
+        public Dictionary<string, int> words;
+
+        public Dictionary<string, int> CountWords(string text)
+        {
+            words = new Dictionary<string, int>();
+
+            foreach (string word in text.Split(' '))
+            {
+                if (words.ContainsKey(word))
+                    words[word]++;
+                else words[word] = 1;
+            }
+
+            return words;
+        }
+    }
+}

TagCloudGeneratorTest/TagCloudGeneratorTest.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0-windows</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="TestsData\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TagCloudGenerator\TagCloudGenerator.csproj" />
+  </ItemGroup>
+
+</Project>

TagCloudGeneratorTest/TagCloudGeneratorTests.cs

@@ -0,0 +1,42 @@
+using FluentAssertions;
+using NUnit.Framework;
+using TagCloudGenerator;
+using System.IO;
+using System;
+
+namespace TagCloudGeneratorTest
+{
+    public class Tests
+    {
+        private TextProcessor textProcessor;
+
+        [SetUp]
+        public void Setup()
+        {
+            var processor = new TextProcessor();
+            textProcessor = processor;
+        }
+
+        [Test]
+        public void WhenPassWordsInUppercase_ShouldReturnWordsInLowerCase()
+        {
+            var filePath = @"C:\Users\lholy\Documents\GitHub\di\TagCloudGeneratorTest\TestsData\test1.txt";
+            var file = File.ReadAllLines(filePath);
+
+            var fileText = textProcessor.ProcessText(file);
+
+            var result = "";
+            for(var i = 0; i < fileText.Length; i++)
+            {
+                if (i == fileText.Length - 1)
+                {
+                    result += fileText[i];
+                    continue;
+                }
+                result += (fileText[i] + Environment.NewLine);
+            }
+
+            result.Should().Be("��������\r\n������\r\n�����\r\n��\r\n�����");
+        }
+    }
+}

TagCloudGeneratorTest/TestsData/test1.txt

@@ -0,0 +1,5 @@
+Создание
+Облака
+Тегов
+Из
+Файла

TagCloudGeneratorTest/TestsData/test2.txt

@@ -0,0 +1,3 @@
+из
+оно
+на

TagCloudGeneratorTest/TestsData/test3.txt

@@ -0,0 +1,26 @@
+Sun
+of
+the 
+sleepless
+Melancholy
+star
+Whose 
+tearful
+beam 
+glows 
+tremulously 
+far
+That 
+show’st 
+the 
+darkness 
+thou
+canst 
+not 
+dispel
+How
+like
+art
+thou 
+to
+joy

TagsCloudVisualization/CircularCloudLayouter.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Drawing;
+using System.Linq;
+using TagsCloudVisualization.PointDistributors;
+
+namespace TagsCloudVisualization
+{
+    public class CircularCloudLayouter : ICircularCloudLayouter
+    {
+        private readonly Cloud cloud;
+        private readonly IPointDistributor distributor;
+
+        public CircularCloudLayouter(Point center, IPointDistributor type)
+        {
+            cloud = new Cloud(center);
+            distributor = type;
+        }
+
+        public Rectangle PutNextRectangle(Size rectangleSize)
+        {
+            if (rectangleSize.Width <= 0 || rectangleSize.Height <= 0)
+                throw new ArgumentException();
+
+            if (cloud.Rectangles.Count == 0)
+                return AddToCenterPosition(rectangleSize);
+
+            var rectangle = new Rectangle(distributor.GetPosition(), rectangleSize);
+
+            while (HaveIntersection(rectangle))
+            {
+                rectangle.Location = distributor.GetPosition();
+            }
+
+            cloud.Rectangles.Add(rectangle);
+
+            return rectangle;
+        }
+
+        private Rectangle AddToCenterPosition(Size rectangleSize)
+        {
+            var newRectangle = new Rectangle(new Point(cloud.Center.X - rectangleSize.Width / 2,
+                cloud.Center.Y - rectangleSize.Height / 2), rectangleSize);
+
+            cloud.Rectangles.Add(newRectangle);
+
+            return newRectangle;
+        }
+
+        private bool HaveIntersection(Rectangle newRectangle) =>
+            cloud.Rectangles.Any(rectangle => rectangle.IntersectsWith(newRectangle));
+    }
+}

TagsCloudVisualization/Cloud.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using System.Drawing;
+
+namespace TagsCloudVisualization
+{
+    public class Cloud
+    {
+        public Cloud(Point center)
+        {
+            Center = center;
+        }
+
+        public readonly Point Center;
+        public readonly List<Rectangle> Rectangles = new();
+    }
+}

TagsCloudVisualization/ICircularCloudLayouter.cs

@@ -0,0 +1,9 @@
+using System.Drawing;
+
+namespace TagsCloudVisualization
+{
+    public interface ICircularCloudLayouter
+    {
+        Rectangle PutNextRectangle(Size rectangleSize);
+    }
+}

TagsCloudVisualization/PointDistributors/IPointDistributor.cs

@@ -0,0 +1,9 @@
+using System.Drawing;
+
+namespace TagsCloudVisualization.PointDistributors
+{
+    public interface IPointDistributor
+    {
+        Point GetPosition();
+    }
+}