0.0.7

+ Матрицы смежности и инцидентности
Начато создание графа из матриц

GraphDrawer/AdjacencyMatrix.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="GraphDrawer.AdjacencyMatrix"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:GraphDrawer"
+        mc:Ignorable="d"
+        Title="Матрица смежности" ResizeMode="NoResize" Height="400" Width="400">
+    <Grid>
+        <TextBox IsReadOnly="True" FontSize="18" x:Name="AdjacencyTextBox"/>
+    </Grid>
+</Window>

GraphDrawer/AdjacencyMatrix.xaml.cs

@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace GraphDrawer
+{
+    /// <summary>
+    /// Interaction logic for AdjacencyMatrix.xaml
+    /// </summary>
+    public partial class AdjacencyMatrix : Window
+    {
+        public AdjacencyMatrix()
+        {
+            InitializeComponent();
+        }
+
+        public AdjacencyMatrix(int[,] matrix, bool state)
+        {
+            InitializeComponent();
+            var length = (int)Math.Sqrt(matrix.Length);
+            for(int i = 0; i < length; i++)
+            {
+                for(int j = 0; j < length; j++)
+                {
+                    AdjacencyTextBox.Text += matrix[i, j] + ",";
+                }
+                AdjacencyTextBox.Text += "\n";
+            }
+            if (state)
+                this.Title = "Матрица инцидентности";
+            else
+                this.Title = "Матрица смежности";
+        }
+    }
+}

GraphDrawer/ChoiseRegime.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:GraphDrawer"
         mc:Ignorable="d"
-        Title="Graph Drawer" Height="250" ResizeMode="NoResize" Width="300">
+        Title="Graph Drawer" WindowStartupLocation="CenterScreen" Height="400" ResizeMode="NoResize" Width="300">
     <Window.Resources>
         <Style TargetType="Button">
             <Setter Property="Background" Value="White"/>
@@ -16,8 +16,10 @@
         <Grid.RowDefinitions>
             <RowDefinition/>
             <RowDefinition/>
+            <RowDefinition/>
         </Grid.RowDefinitions>
         <Button Content="Ввести количество" Click="Button_Click"/>
         <Button Content="Ввести кликами" Grid.Row="1" Click="Button_Click_1"/>
+        <Button Content="Граф из матрицы" Grid.Row="2" Click="Button_Click_2"/>
     </Grid>
 </Window>

GraphDrawer/ChoiseRegime.xaml.cs

@@ -37,5 +37,12 @@ namespace GraphDrawer
             click.Show();
             Close();
         }
+
+        private void Button_Click_2(object sender, RoutedEventArgs e)
+        {
+            GraphByMatrix matrix = new GraphByMatrix();
+            matrix.Show();
+            Close();
+        }
     }
 }

GraphDrawer/GraphByClick.xaml

@@ -27,9 +27,11 @@
                 <MenuItem Header="Алгоритмы">
                     
                 </MenuItem>
-                <MenuItem Header="WIP">
-                    
+                <MenuItem Header="Матрицы">
+                    <MenuItem Header="Матрица смежности" Name="AdjacencyBtn" Click="AdjacencyBtn_Click"/>
+                    <MenuItem Header="Матрица инцидентности" Name="IncidenceBtn" Click="IncidenceBtn_Click"/>
                 </MenuItem>
+                <MenuItem Header="Ввести граф из матрицы" Name="GraphByMatrixBtn" Click="GraphByMatrix_Click"/>
             </MenuItem>
         </Menu>
         <Grid x:Name="choiceGrid" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,25,0,0">

GraphDrawer/GraphByClick.xaml.cs

@@ -26,6 +26,30 @@ namespace GraphDrawer
 
             VertexArray.vertexCount = 0;
         }
+        public GraphByClick(int[,] matrix, bool state)
+        {
+            InitializeComponent();
+            VertexArray.vertexCount = 0;
+            if (state)
+            {
+                int length = (int)Math.Sqrt(matrix.Length);
+                for(int i = 0; i < length; i++)
+                {
+                    VertexArray.AddVertex(canvas, rand.Next(0, (int)canvas.ActualWidth/2), rand.Next(0, (int)canvas.ActualHeight/2));
+                }
+
+                for(int i = 0; i < length; i++)
+                {
+                    for(int j = 0; j < length; j++)
+                    {
+                        if (matrix[i, j] == 1)
+                        {
+                            EdgeArray.AddEdge(canvas, VertexArray.vertex[i], VertexArray.vertex[j]);
+                        }
+                    }
+                }
+            }
+        }
 
         private void backBtn_Click(object sender, RoutedEventArgs e) // Выбор режима рисования
         {
@@ -213,6 +237,108 @@ namespace GraphDrawer
         {
             GraphState.named = false;
         }
+
+        private void AdjacencyBtn_Click(object sender, RoutedEventArgs e)
+        {
+            if (!GraphState.focused)
+            {
+                int length = VertexArray.vertex.Length;
+                int[,] matrix = new int[length, length];
+                for (int i = 0; i < length; i++)
+                {
+                    var vertex1 = VertexArray.vertex[i];
+                    for (int j = 0; j < length; j++)
+                    {
+                        var vertex2 = VertexArray.vertex[j];
+                        for (int k = 0; k < EdgeArray.edge.Length; k++)
+                        {
+                            var edge = EdgeArray.edge[k];
+                            if (i == j)
+                            {
+                                matrix[i, j] = 0;
+                            }
+                            else if ((Vertex.Compare(vertex1, edge.startVertex) && Vertex.Compare(vertex2, edge.finishVertex)) || (Vertex.Compare(vertex1, edge.finishVertex) && Vertex.Compare(vertex2, edge.startVertex)))
+                            {
+                                matrix[i, j] = 1;
+                                matrix[j, i] = matrix[i, j];
+                            }
+                            else
+                            {
+                                matrix[i, j] = 0;
+                            }
+                        }
+                    }
+                }
+                for (int i = 0; i < length; i++)
+                    for (int j = 0; j < length; j++)
+                        if (i > j)
+                            matrix[i, j] = matrix[j, i];
+                AdjacencyMatrix adjacencyMatrix = new AdjacencyMatrix(matrix, false);
+                adjacencyMatrix.Show();
+            }
+            else
+            {
+                int length = VertexArray.vertex.Length;
+                int[,] matrix = new int[length, length];
+                for (int i = 0; i < length; i++)
+                {
+                    var vertex1 = VertexArray.vertex[i];
+                    for (int j = 0; j < length; j++)
+                    {
+                        var vertex2 = VertexArray.vertex[j];
+                        for (int k = 0; k < ArrowedEdgeArray.edge.Length; k++)
+                        {
+                            var edge = ArrowedEdgeArray.edge[k];
+                            if (i == j)
+                            {
+                                matrix[i, j] = 0;
+                            }
+                            else if ((Vertex.Compare(vertex1, edge.startVertex) && Vertex.Compare(vertex2, edge.finishVertex)))
+                            {
+                                matrix[i, j] = 1;
+                            }
+                            else
+                            {
+                                matrix[i, j] = 0;
+                            }
+                        }
+                    }
+                }
+                AdjacencyMatrix adjacencyMatrix = new AdjacencyMatrix(matrix, false);
+                adjacencyMatrix.Show();
+            }
+        }
+
+        private void IncidenceBtn_Click(object sender, RoutedEventArgs e)
+        {
+            int vertexLength = VertexArray.vertex.Length;
+            int edgeLength = EdgeArray.edge.Length;
+            int[,] matrix = new int[vertexLength, edgeLength];
+            for(int i = 0; i < vertexLength; i++)
+            {
+                var vertex = VertexArray.vertex[i];
+                for(int j = 0; j < edgeLength; j++)
+                {
+                    var edge = EdgeArray.edge[j];
+                    if(Vertex.Compare(vertex, edge.startVertex) || Vertex.Compare(vertex, edge.finishVertex))
+                    {
+                        matrix[i, j] = 1;
+                    }
+                    else
+                    {
+                        matrix[i, j] = 0;
+                    }
+                }
+            }
+            AdjacencyMatrix incidence = new AdjacencyMatrix(matrix, true);
+            incidence.Show();
+        }
+
+        private void GraphByMatrix_Click(object sender, RoutedEventArgs e)
+        {
+            GraphByMatrix graph = new GraphByMatrix();
+            graph.Show();
+        }
     }
 
     public class VertexArray
@@ -226,7 +352,6 @@ namespace GraphDrawer
 
         public static int AddVertex(Canvas canvas, int x, int y)
         {
-
             vertexCount++;
             Array.Resize(ref vertex, vertexCount);
             Array.Resize(ref ellipse, vertexCount);
@@ -284,8 +409,6 @@ namespace GraphDrawer
 
         public static void AddEdge(Canvas canvas, Vertex v1, Vertex v2)
         {
-            if (edgeCount == 0) edgeCount++;
-
             edgeCount++;
             Array.Resize(ref edge, edgeCount);
             Array.Resize(ref line, edgeCount);

GraphDrawer/GraphByMatrix.xaml

@@ -0,0 +1,25 @@
+<Window x:Class="GraphDrawer.GraphByMatrix"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:GraphDrawer"
+        mc:Ignorable="d"
+        Title="Graph Drawer" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Height="450" Width="500">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition Height="50"/>
+        </Grid.RowDefinitions>
+        <TextBox x:Name="MatrixTextBox" TextWrapping="Wrap" AcceptsReturn="True"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal">
+            <ComboBox Width="150" x:Name="SelectModeComboBox" VerticalAlignment="Center" Margin="10,0,0,0">
+                <ComboBoxItem Content="Матрица смежности"/>
+                <ComboBoxItem Content="Матрица инцидентности"/>
+            </ComboBox>
+            <TextBlock Text="Разделитель: запятая (,)" VerticalAlignment="Center" Margin="10,0,0,0"/>
+            <Button x:Name="submitBtn" Content="Сохранить" Height="30" Margin="20,0" Width="80" Background="LightBlue" VerticalAlignment="Center" Click="submitBtn_Click"/>
+            <Button x:Name="backBtn" Content="Назад" Height="30" Width="60" Margin="5,0" Background="IndianRed" Click="backBtn_Click"/>
+        </StackPanel>
+    </Grid>
+</Window>

GraphDrawer/GraphByMatrix.xaml.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace GraphDrawer
+{
+    /// <summary>
+    /// Interaction logic for GraphByMatrix.xaml
+    /// </summary>
+    public partial class GraphByMatrix : Window
+    {
+        T[,] ResizeArray<T>(T[,] original, int rows, int cols)
+        {
+            var newArray = new T[rows, cols];
+            int minRows = Math.Min(rows, original.GetLength(0));
+            int minCols = Math.Min(cols, original.GetLength(1));
+            for (int i = 0; i < minRows; i++)
+                for (int j = 0; j < minCols; j++)
+                    newArray[i, j] = original[i, j];
+            return newArray;
+        }
+
+        public GraphByMatrix()
+        {
+            InitializeComponent();
+        }
+
+        private void submitBtn_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                var row = MatrixTextBox.GetLineText(0);
+                row = row.Replace(" ", "");
+                var elements = row.Split(',');
+                int rows = elements.Length;
+                int cols = 0;
+                while (true)
+                {
+                    var String = MatrixTextBox.GetLineText(cols);
+                    if (!(String.Length > 0))
+                        cols++;
+                    else
+                        break;
+                }
+                int[,] matrix = new int[rows, cols];
+                for(int i = 0; i < rows; i++)
+                {
+                    row = MatrixTextBox.GetLineText(i);
+                    row = row.Replace(" ", "");
+                    var rowArray = row.Split(',');
+                    for(int j = 0; j < cols; j++)
+                    {
+                        matrix[i, j] = int.Parse(rowArray[j]);
+                    }
+                }
+                GraphByClick graphByClick = new GraphByClick(matrix, true);
+            }
+            catch(Exception ex)
+            {
+                MessageBox.Show("Разделитель - запятая\nПопробуйте еще раз", "Ошибка", MessageBoxButton.OK, MessageBoxImage.Error);
+                MessageBox.Show(ex.Message);
+            }
+        }
+
+        private void backBtn_Click(object sender, RoutedEventArgs e)
+        {
+            ChoiseRegime choice = new ChoiseRegime();
+            choice.Show();
+            Close();
+        }
+    }
+}

GraphDrawer/GraphDrawer.csproj

@@ -56,6 +56,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AdjacencyMatrix.xaml.cs">
+      <DependentUpon>AdjacencyMatrix.xaml</DependentUpon>
+    </Compile>
     <Compile Include="ArrowLine.cs" />
     <Compile Include="ArrowLineBase.cs" />
     <Compile Include="ChoiseRegime.xaml.cs">
@@ -65,8 +68,15 @@
     <Compile Include="GraphByClick.xaml.cs">
       <DependentUpon>GraphByClick.xaml</DependentUpon>
     </Compile>
+    <Compile Include="GraphByMatrix.xaml.cs">
+      <DependentUpon>GraphByMatrix.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GraphState.cs" />
     <Compile Include="Vertex.cs" />
+    <Page Include="AdjacencyMatrix.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ChoiseRegime.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -75,6 +85,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="GraphByMatrix.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

GraphDrawer/MainWindow.xaml.cs

@@ -1,16 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
 using System.Windows.Shapes;
 
 namespace GraphDrawer
@@ -48,40 +39,26 @@ namespace GraphDrawer
                 {
                     int x = rand.Next(50, canvasWidth);
                     int y = rand.Next(50, canvasHeight);
-                    vertices[i] = new Vertex(x, y, 0);
+                    //vertices[i] = new Vertex(x, y, 0);
                     DrawVertex(ellipse[i], canvas, vertices[i]);
                 }
 
                 for (int i = 0; i < vertexCount; i++)
                 {
-                    if (vertices[i].edgeCount < edgeCount)
-                    {
-                        for (int j = 0; j < vertexCount; j++)
-                        {
-                            if (vertices[j].edgeCount < edgeCount)
-                            {
-                                edges[i] = new Edge(lines[i], vertices[j], vertices[i]);
-                                vertices[i].edgeCount++;
-                                vertices[j].edgeCount++;
-                                DrawEdge(canvas, lines[i], edges[i]);
-                            }
-                        }
-                    }
+                    //if (vertices[i].edgeCount < edgeCount)
+                    //{
+                    //    for (int j = 0; j < vertexCount; j++)
+                    //    {
+                    //        if (vertices[j].edgeCount < edgeCount)
+                    //        {
+                    //            edges[i] = new Edge(lines[i], vertices[j], vertices[i]);
+                    //            //vertices[i].edgeCount++;
+                    //            //vertices[j].edgeCount++;
+                    //            DrawEdge(canvas, lines[i], edges[i]);
+                    //        }
+                    //    }
+                    //}
                 }
-
-                //for (int i = 0; i < vertexCount; i++)
-                //{
-                //    for (int j = i; j < vertexCount; j++ )
-                //    {
-                //        if (vertices[j].edgeCount <= edgeCount && vertices[i].edgeCount<=edgeCount)
-                //        {
-                //            edges[i] = new Edge(lines[i], vertices[j], vertices[i]);
-                //            vertices[j].edgeCount++;
-                //            vertices[i].edgeCount++;
-                //            DrawEdge(canvas, lines[i], edges[i]);
-                //        }
-                //    }
-                //}
             }
         }
 

GraphDrawer/Vertex.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Reflection;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Shapes;
@@ -9,13 +10,13 @@ namespace GraphDrawer
     {
         public int X { get; set; }
         public int Y { get; set; }
-        public int edgeCount { get; set; }
+        //public int edgeCount { get; set; }
 
         public Vertex(int x, int y, int edgeCount)
         {
             X = x;
             Y = y;
-            this.edgeCount = edgeCount;
+            //this.edgeCount = edgeCount;
         }
 
         public Vertex(int x, int y)
@@ -23,5 +24,14 @@ namespace GraphDrawer
             X = x;
             Y = y;
         }
+
+        public static bool Compare(Vertex v1, Vertex v2)
+        {
+            if (Equals(v1.X, v2.X) && Equals(v1.Y, v2.Y))
+                return true;
+            else if (v1.X == v2.X && v1.Y == v2.Y)
+                return true;
+            return false;
+        }
     }
 }

GraphDrawer/obj/Debug/AdjacencyMatrix.g.cs

@@ -0,0 +1,89 @@
+#pragma checksum "..\..\AdjacencyMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B21DE93B130B522D03862E35AC5B8D04DD502688AA5D8163D9D77865FC529DB3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using GraphDrawer;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace GraphDrawer {
+    
+    
+    /// <summary>
+    /// AdjacencyMatrix
+    /// </summary>
+    public partial class AdjacencyMatrix : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 10 "..\..\AdjacencyMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox AdjacencyTextBox;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/GraphDrawer;component/adjacencymatrix.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\AdjacencyMatrix.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.AdjacencyTextBox = ((System.Windows.Controls.TextBox)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+

GraphDrawer/obj/Debug/AdjacencyMatrix.g.i.cs

@@ -0,0 +1,89 @@
+#pragma checksum "..\..\AdjacencyMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B21DE93B130B522D03862E35AC5B8D04DD502688AA5D8163D9D77865FC529DB3"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using GraphDrawer;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace GraphDrawer {
+    
+    
+    /// <summary>
+    /// AdjacencyMatrix
+    /// </summary>
+    public partial class AdjacencyMatrix : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 10 "..\..\AdjacencyMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox AdjacencyTextBox;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/GraphDrawer;component/adjacencymatrix.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\AdjacencyMatrix.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.AdjacencyTextBox = ((System.Windows.Controls.TextBox)(target));
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+

GraphDrawer/obj/Debug/ChoiseRegime.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\ChoiseRegime.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A8ADBB8E4B9B0AD408883526C6DDA9A250B34E1B14EF12ACC6EA854889AA1C50"
+#pragma checksum "..\..\ChoiseRegime.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51ADE619A72EC6D76F093CA8C9B531DE987EA41108CF669A19D8714D5C3877DC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -72,7 +72,7 @@ namespace GraphDrawer {
             {
             case 1:
             
-            #line 20 "..\..\ChoiseRegime.xaml"
+            #line 21 "..\..\ChoiseRegime.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
@@ -80,12 +80,20 @@ namespace GraphDrawer {
             return;
             case 2:
             
-            #line 21 "..\..\ChoiseRegime.xaml"
+            #line 22 "..\..\ChoiseRegime.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_1);
             
             #line default
             #line hidden
             return;
+            case 3:
+            
+            #line 23 "..\..\ChoiseRegime.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_2);
+            
+            #line default
+            #line hidden
+            return;
             }
             this._contentLoaded = true;
         }

GraphDrawer/obj/Debug/ChoiseRegime.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\ChoiseRegime.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A8ADBB8E4B9B0AD408883526C6DDA9A250B34E1B14EF12ACC6EA854889AA1C50"
+#pragma checksum "..\..\ChoiseRegime.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "51ADE619A72EC6D76F093CA8C9B531DE987EA41108CF669A19D8714D5C3877DC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -72,7 +72,7 @@ namespace GraphDrawer {
             {
             case 1:
             
-            #line 20 "..\..\ChoiseRegime.xaml"
+            #line 21 "..\..\ChoiseRegime.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click);
             
             #line default
@@ -80,12 +80,20 @@ namespace GraphDrawer {
             return;
             case 2:
             
-            #line 21 "..\..\ChoiseRegime.xaml"
+            #line 22 "..\..\ChoiseRegime.xaml"
             ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_1);
             
             #line default
             #line hidden
             return;
+            case 3:
+            
+            #line 23 "..\..\ChoiseRegime.xaml"
+            ((System.Windows.Controls.Button)(target)).Click += new System.Windows.RoutedEventHandler(this.Button_Click_2);
+            
+            #line default
+            #line hidden
+            return;
             }
             this._contentLoaded = true;
         }

GraphDrawer/obj/Debug/GraphByClick.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "54985F503863C1EA05F6F4982CB93E9AB124A1985FA47F261FE6086EEB96BFAC"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "59E82A882709272D1CC59D9EC1655131E84A84875301DE10CAA3C1DFA3A2CD09"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -73,9 +73,9 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 27 "..\..\GraphByClick.xaml"
+        #line 31 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid choiceGrid;
+        internal System.Windows.Controls.MenuItem AdjacencyBtn;
         
         #line default
         #line hidden
@@ -83,13 +83,37 @@ namespace GraphDrawer {
         
         #line 32 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem IncidenceBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 34 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem GraphByMatrixBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 37 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Grid choiceGrid;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 42 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton vertexRb;
         
         #line default
         #line hidden
         
         
-        #line 33 "..\..\GraphByClick.xaml"
+        #line 43 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton edgeRb;
         
@@ -97,7 +121,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 36 "..\..\GraphByClick.xaml"
+        #line 46 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button clearBtn;
         
@@ -105,7 +129,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 37 "..\..\GraphByClick.xaml"
+        #line 47 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button exportPngBtn;
         
@@ -113,7 +137,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 38 "..\..\GraphByClick.xaml"
+        #line 48 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button backBtn;
         
@@ -121,7 +145,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 41 "..\..\GraphByClick.xaml"
+        #line 51 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas canvas;
         
@@ -129,7 +153,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 44 "..\..\GraphByClick.xaml"
+        #line 54 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem saveBtn;
         
@@ -137,7 +161,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 45 "..\..\GraphByClick.xaml"
+        #line 55 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem printBtn;
         
@@ -145,7 +169,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 50 "..\..\GraphByClick.xaml"
+        #line 60 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delEdgeBtn;
         
@@ -153,7 +177,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 51 "..\..\GraphByClick.xaml"
+        #line 61 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delArcBtn;
         
@@ -161,7 +185,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 52 "..\..\GraphByClick.xaml"
+        #line 62 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delAllBtn;
         
@@ -235,84 +259,111 @@ namespace GraphDrawer {
             #line hidden
             return;
             case 5:
-            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
+            this.AdjacencyBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 31 "..\..\GraphByClick.xaml"
+            this.AdjacencyBtn.Click += new System.Windows.RoutedEventHandler(this.AdjacencyBtn_Click);
+            
+            #line default
+            #line hidden
             return;
             case 6:
-            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
+            this.IncidenceBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 32 "..\..\GraphByClick.xaml"
+            this.IncidenceBtn.Click += new System.Windows.RoutedEventHandler(this.IncidenceBtn_Click);
+            
+            #line default
+            #line hidden
             return;
             case 7:
-            this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
+            this.GraphByMatrixBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 34 "..\..\GraphByClick.xaml"
+            this.GraphByMatrixBtn.Click += new System.Windows.RoutedEventHandler(this.GraphByMatrix_Click);
+            
+            #line default
+            #line hidden
             return;
             case 8:
+            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
+            return;
+            case 9:
+            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
+            return;
+            case 10:
+            this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
+            return;
+            case 11:
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 36 "..\..\GraphByClick.xaml"
+            #line 46 "..\..\GraphByClick.xaml"
             this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 9:
+            case 12:
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 37 "..\..\GraphByClick.xaml"
+            #line 47 "..\..\GraphByClick.xaml"
             this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 10:
+            case 13:
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 38 "..\..\GraphByClick.xaml"
+            #line 48 "..\..\GraphByClick.xaml"
             this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 11:
+            case 14:
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
-            #line 41 "..\..\GraphByClick.xaml"
+            #line 51 "..\..\GraphByClick.xaml"
             this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
             
             #line default
             #line hidden
             return;
-            case 12:
+            case 15:
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 44 "..\..\GraphByClick.xaml"
+            #line 54 "..\..\GraphByClick.xaml"
             this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 13:
+            case 16:
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 45 "..\..\GraphByClick.xaml"
+            #line 55 "..\..\GraphByClick.xaml"
             this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 14:
+            case 17:
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 50 "..\..\GraphByClick.xaml"
+            #line 60 "..\..\GraphByClick.xaml"
             this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 15:
+            case 18:
             this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
             return;
-            case 16:
+            case 19:
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\GraphByClick.xaml"
+            #line 62 "..\..\GraphByClick.xaml"
             this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default

GraphDrawer/obj/Debug/GraphByClick.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "54985F503863C1EA05F6F4982CB93E9AB124A1985FA47F261FE6086EEB96BFAC"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "59E82A882709272D1CC59D9EC1655131E84A84875301DE10CAA3C1DFA3A2CD09"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -73,9 +73,9 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 27 "..\..\GraphByClick.xaml"
+        #line 31 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid choiceGrid;
+        internal System.Windows.Controls.MenuItem AdjacencyBtn;
         
         #line default
         #line hidden
@@ -83,13 +83,37 @@ namespace GraphDrawer {
         
         #line 32 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem IncidenceBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 34 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem GraphByMatrixBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 37 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Grid choiceGrid;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 42 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton vertexRb;
         
         #line default
         #line hidden
         
         
-        #line 33 "..\..\GraphByClick.xaml"
+        #line 43 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton edgeRb;
         
@@ -97,7 +121,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 36 "..\..\GraphByClick.xaml"
+        #line 46 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button clearBtn;
         
@@ -105,7 +129,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 37 "..\..\GraphByClick.xaml"
+        #line 47 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button exportPngBtn;
         
@@ -113,7 +137,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 38 "..\..\GraphByClick.xaml"
+        #line 48 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button backBtn;
         
@@ -121,7 +145,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 41 "..\..\GraphByClick.xaml"
+        #line 51 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas canvas;
         
@@ -129,7 +153,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 44 "..\..\GraphByClick.xaml"
+        #line 54 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem saveBtn;
         
@@ -137,7 +161,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 45 "..\..\GraphByClick.xaml"
+        #line 55 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem printBtn;
         
@@ -145,7 +169,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 50 "..\..\GraphByClick.xaml"
+        #line 60 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delEdgeBtn;
         
@@ -153,7 +177,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 51 "..\..\GraphByClick.xaml"
+        #line 61 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delArcBtn;
         
@@ -161,7 +185,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 52 "..\..\GraphByClick.xaml"
+        #line 62 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delAllBtn;
         
@@ -235,84 +259,111 @@ namespace GraphDrawer {
             #line hidden
             return;
             case 5:
-            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
+            this.AdjacencyBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 31 "..\..\GraphByClick.xaml"
+            this.AdjacencyBtn.Click += new System.Windows.RoutedEventHandler(this.AdjacencyBtn_Click);
+            
+            #line default
+            #line hidden
             return;
             case 6:
-            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
+            this.IncidenceBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 32 "..\..\GraphByClick.xaml"
+            this.IncidenceBtn.Click += new System.Windows.RoutedEventHandler(this.IncidenceBtn_Click);
+            
+            #line default
+            #line hidden
             return;
             case 7:
-            this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
+            this.GraphByMatrixBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 34 "..\..\GraphByClick.xaml"
+            this.GraphByMatrixBtn.Click += new System.Windows.RoutedEventHandler(this.GraphByMatrix_Click);
+            
+            #line default
+            #line hidden
             return;
             case 8:
+            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
+            return;
+            case 9:
+            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
+            return;
+            case 10:
+            this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
+            return;
+            case 11:
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 36 "..\..\GraphByClick.xaml"
+            #line 46 "..\..\GraphByClick.xaml"
             this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 9:
+            case 12:
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 37 "..\..\GraphByClick.xaml"
+            #line 47 "..\..\GraphByClick.xaml"
             this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 10:
+            case 13:
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 38 "..\..\GraphByClick.xaml"
+            #line 48 "..\..\GraphByClick.xaml"
             this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 11:
+            case 14:
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
-            #line 41 "..\..\GraphByClick.xaml"
+            #line 51 "..\..\GraphByClick.xaml"
             this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
             
             #line default
             #line hidden
             return;
-            case 12:
+            case 15:
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 44 "..\..\GraphByClick.xaml"
+            #line 54 "..\..\GraphByClick.xaml"
             this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 13:
+            case 16:
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 45 "..\..\GraphByClick.xaml"
+            #line 55 "..\..\GraphByClick.xaml"
             this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 14:
+            case 17:
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 50 "..\..\GraphByClick.xaml"
+            #line 60 "..\..\GraphByClick.xaml"
             this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 15:
+            case 18:
             this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
             return;
-            case 16:
+            case 19:
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\GraphByClick.xaml"
+            #line 62 "..\..\GraphByClick.xaml"
             this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default

GraphDrawer/obj/Debug/GraphByMatrix.g.cs

@@ -0,0 +1,134 @@
+#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "453FCE708EF09FCA2B6784CE3A46E9A27A2BDE04E947F8E57015F0B16CB9C270"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using GraphDrawer;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace GraphDrawer {
+    
+    
+    /// <summary>
+    /// GraphByMatrix
+    /// </summary>
+    public partial class GraphByMatrix : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 14 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox MatrixTextBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 16 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox SelectModeComboBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 21 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button submitBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 22 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button backBtn;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/GraphDrawer;component/graphbymatrix.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\GraphByMatrix.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.MatrixTextBox = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 2:
+            this.SelectModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 3:
+            this.submitBtn = ((System.Windows.Controls.Button)(target));
+            
+            #line 21 "..\..\GraphByMatrix.xaml"
+            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.submitBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.backBtn = ((System.Windows.Controls.Button)(target));
+            
+            #line 22 "..\..\GraphByMatrix.xaml"
+            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+

GraphDrawer/obj/Debug/GraphByMatrix.g.i.cs

@@ -0,0 +1,134 @@
+#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "453FCE708EF09FCA2B6784CE3A46E9A27A2BDE04E947F8E57015F0B16CB9C270"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using GraphDrawer;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace GraphDrawer {
+    
+    
+    /// <summary>
+    /// GraphByMatrix
+    /// </summary>
+    public partial class GraphByMatrix : System.Windows.Window, System.Windows.Markup.IComponentConnector {
+        
+        
+        #line 14 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.TextBox MatrixTextBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 16 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.ComboBox SelectModeComboBox;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 21 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button submitBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 22 "..\..\GraphByMatrix.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Button backBtn;
+        
+        #line default
+        #line hidden
+        
+        private bool _contentLoaded;
+        
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent() {
+            if (_contentLoaded) {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/GraphDrawer;component/graphbymatrix.xaml", System.UriKind.Relative);
+            
+            #line 1 "..\..\GraphByMatrix.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+            
+            #line default
+            #line hidden
+        }
+        
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target) {
+            switch (connectionId)
+            {
+            case 1:
+            this.MatrixTextBox = ((System.Windows.Controls.TextBox)(target));
+            return;
+            case 2:
+            this.SelectModeComboBox = ((System.Windows.Controls.ComboBox)(target));
+            return;
+            case 3:
+            this.submitBtn = ((System.Windows.Controls.Button)(target));
+            
+            #line 21 "..\..\GraphByMatrix.xaml"
+            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.submitBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 4:
+            this.backBtn = ((System.Windows.Controls.Button)(target));
+            
+            #line 22 "..\..\GraphByMatrix.xaml"
+            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            }
+            this._contentLoaded = true;
+        }
+    }
+}
+

GraphDrawer/obj/Debug/GraphDrawer.csproj.FileListAbsolute.txt

@@ -48,3 +48,7 @@ C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphDrawer.Properties.Reso
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphDrawer.csproj.GenerateResource.cache
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphDrawer.exe
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphDrawer.pdb
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\AdjacencyMatrix.g.cs
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\AdjacencyMatrix.baml
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphByMatrix.g.cs
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\GraphByMatrix.baml

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
-3616127476
+52056349942
 
-12871213070
+141380625537
 141183416626
-ChoiseRegime.xaml;GraphByClick.xaml;MainWindow.xaml;
+AdjacencyMatrix.xaml;ChoiseRegime.xaml;GraphByClick.xaml;GraphByMatrix.xaml;MainWindow.xaml;
 
 False
 

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
-3616127476
+52056349942
 
-131271447095
+151780859562
 141183416626
-ChoiseRegime.xaml;GraphByClick.xaml;MainWindow.xaml;
+AdjacencyMatrix.xaml;ChoiseRegime.xaml;GraphByClick.xaml;GraphByMatrix.xaml;MainWindow.xaml;
 
-False
+True
 

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.lref

@@ -0,0 +1,5 @@
+
+
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\ChoiseRegime.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByMatrix.xaml;;
+

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.lref

@@ -3,4 +3,6 @@
 FC:\Users\locadm\Desktop\Graphs\GraphDrawer\ChoiseRegime.xaml;;
 FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByClick.xaml;;
 FC:\Users\locadm\Desktop\Graphs\GraphDrawer\MainWindow.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\AdjacencyMatrix.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByMatrix.xaml;;
 

GraphDrawer/obj/Debug/MainWindow.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6E2532B15930216500B7BC2E409C789521A4EDDA84BB517CED108A7E919418AA"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B2A5085B5D2A36954FD16FD5B0D1C36416FAF8C1779FDC4E36AEEC94EB3FC735"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.

GraphDrawer/obj/Debug/MainWindow.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6E2532B15930216500B7BC2E409C789521A4EDDA84BB517CED108A7E919418AA"
+#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "B2A5085B5D2A36954FD16FD5B0D1C36416FAF8C1779FDC4E36AEEC94EB3FC735"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.