From bdefa06fac8b28b60c68dff5a2feec422cd75056 Mon Sep 17 00:00:00 2001
From: Philipp Albrecht <philipp@uisa.ch>
Date: Tue, 2 Mar 2021 00:28:24 +0100
Subject: [PATCH] - Added MAC address table reset button  - fixed user score
 calculation

---
 MacTable.cs          | 4 ++--
 MainWindow.xaml      | 5 +++--
 MainWindow.xaml.cs   | 6 +++++-
 SwitchEngine.cs      | 5 +++++
 UserScore.cs         | 4 ++--
 VLANSimulator.csproj | 5 +++--
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/MacTable.cs b/MacTable.cs
index 1f05bf5..ab12bc0 100644
--- a/MacTable.cs
+++ b/MacTable.cs
@@ -22,11 +22,11 @@ public SwitchPort this[string mac]
 
         public override string ToString()
         {
-            var output = " MAC  |  Port\n";
+            var output = " MAC  | Port\n";
                output += "--------------\n";
             foreach(var e in macAddressToSwichPort)
             {
-                output += String.Format("{0,-5} | {1,-5}\n", e.Key, e.Value.Num.ToString());
+                output += String.Format(" {0,-5}| {1,-5}\n", e.Key, e.Value.Num.ToString());
             }
             return output;
         }
diff --git a/MainWindow.xaml b/MainWindow.xaml
index 3a74da4..3a3c2ec 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -5,14 +5,15 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:VLANSimulator"
         mc:Ignorable="d"
-        Title="VLAN Switch Simulator by Philipp Albrecht &lt;philipp@uisa.ch&gt;  https://github.com/muqiuq/vlansimulator" Height="600" Width="930">
+        Title="VLAN Switch Simulator by Philipp Albrecht &lt;philipp@uisa.ch&gt;  https://github.com/muqiuq/vlansimulator" Height="630" Width="930" ResizeMode="NoResize">
     <Grid x:Name="mainGrid">
         <Button x:Name="buttonCheck" Content="Start" HorizontalAlignment="Left" Margin="320,449,0,0" VerticalAlignment="Top" Click="buttonCheckClick" Width="270" Height="41" FontSize="16"/>
-        <TextBox x:Name="textBoxMacTables" HorizontalAlignment="Left" Margin="320,10,0,0" Text="MAC Address Tables are empty" TextWrapping="Wrap" VerticalAlignment="Top" Width="270" Height="433" FontFamily="Courier New" FontSize="14"/>
+        <TextBox x:Name="textBoxMacTables" HorizontalAlignment="Left" Margin="320,10,0,0" Text="MAC address tables are empty" TextWrapping="Wrap" VerticalAlignment="Top" Width="270" Height="433" FontFamily="Courier New" FontSize="14"/>
         <Rectangle Margin="10,0,475,10" VerticalAlignment="Bottom" Height="44" Fill="LightGreen" Stroke="LightGray"/>
         <TextBlock x:Name="textBlockAction" Margin="15,0,480,15" Text="" TextWrapping="Wrap" VerticalAlignment="Bottom" Height="35" FontFamily="Courier New" FontSize="14"/>
         <Rectangle Margin="460,0,10,10" VerticalAlignment="Bottom" Height="44" Fill="LightYellow" Stroke="LightGray"/>
         <TextBlock x:Name="textBlockPoints" Margin="460,0,15,15" Text="" TextWrapping="Wrap" VerticalAlignment="Bottom" Height="35" FontFamily="Courier New" FontSize="14"/>
+        <Button x:Name="buttonClearMacTable" Content="Clear MAC address tables" Margin="374,505,394,0" VerticalAlignment="Top" Click="buttonClearMacTable_Click"/>
 
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0316f81..b78aebd 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -183,6 +183,10 @@ private void buttonCheckClick(object sender, RoutedEventArgs e)
             }
         }
 
-
+        private void buttonClearMacTable_Click(object sender, RoutedEventArgs e)
+        {
+            switchEngine.ClearMacAddressTables();
+            textBoxMacTables.Text = "MAC address tables are empty.";
+        }
     }
 }
diff --git a/SwitchEngine.cs b/SwitchEngine.cs
index 7c51443..0a34078 100644
--- a/SwitchEngine.cs
+++ b/SwitchEngine.cs
@@ -30,6 +30,11 @@ public string GetMacTablesAsPrettyString()
             return output;
         }
 
+        public void ClearMacAddressTables()
+        {
+            macTablePerVlan.Clear();
+            }
+
         public SwitchAction ProcessEthernetFrame(EthernetFrame ethernetFrame)
         {
             if (ethernetFrame.AttachedCurrentlyToSwitchPort == null) return null;
diff --git a/UserScore.cs b/UserScore.cs
index 5e9e730..aa94722 100644
--- a/UserScore.cs
+++ b/UserScore.cs
@@ -27,8 +27,8 @@ public void WrongAnswer()
         public override string ToString()
         {
             if (correctAnswers + wrongAnswers == 0) return "";
-            return String.Format("{0} points ({1}/{2}, {3}% correct)", Score.ToString("#,##0"), correctAnswers, wrongAnswers, 
-                ((correctAnswers/(correctAnswers+wrongAnswers))* 100).ToString("0.##")
+            return String.Format("{0} points ({1}/{2}, {3}% correct)", Score.ToString("#,##0"), correctAnswers, correctAnswers + wrongAnswers, 
+                (((decimal)correctAnswers/(correctAnswers+wrongAnswers))* 100).ToString("0.##")
                 );
         }
     }
diff --git a/VLANSimulator.csproj b/VLANSimulator.csproj
index bf420cf..6f8d9d1 100644
--- a/VLANSimulator.csproj
+++ b/VLANSimulator.csproj
@@ -11,8 +11,9 @@
     <PackageIcon>networkswitch.png</PackageIcon>
     <RepositoryUrl>https://github.com/muqiuq/vlansimulator</RepositoryUrl>
     <StartupObject>VLANSimulator.App</StartupObject>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
-    <FileVersion>1.2.0.0</FileVersion>
+    <AssemblyVersion>1.3.0.0</AssemblyVersion>
+    <FileVersion>1.3.0.0</FileVersion>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>