Clone 메서드에서 객체 타입으로 반환하도록 개선

sunghwan2789 · Dec 1, 2018 · 780788f · 780788f
1 parent 7e0ec07
commit 780788f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 12 deletions.
diff --git a/ClassDiagram1.png b/ClassDiagram1.png
diff --git a/SchedulerSimulator/ClassDiagram1.cd b/SchedulerSimulator/ClassDiagram1.cd
@@ -8,51 +8,51 @@
     </TypeIdentifier>
   </Class>
   <Class Name="SchedulerSimulator.HighestResponseRatioNext">
-    <Position X="14.25" Y="12.75" Width="1.75" />
+    <Position X="14.5" Y="12.75" Width="1.75" />
     <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAAAAAAAAAIDAACAAAAAAAAAAAAAACAA=</HashCode>
       <FileName>HighestResponseRatioNext.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="SchedulerSimulator.MainWindow" BaseTypeListCollapsed="true">
-    <Position X="12.5" Y="5.25" Width="2.75" />
+    <Position X="12.25" Y="5.5" Width="2.75" />
     <TypeIdentifier>
       <HashCode>AAABAAIAAAIAAAAIAAAAAAAAAAABAABAAAAQAAAAAAA=</HashCode>
       <FileName>MainWindow.xaml.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="SchedulerSimulator.NonPreemptivePriority">
-    <Position X="7" Y="12.75" Width="2.25" />
+    <Position X="7.25" Y="12.75" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAAAAAAAAAIDAAAAAAAAAAAAAAAAACAA=</HashCode>
       <FileName>NonPreemptivePriority.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="SchedulerSimulator.PreemptivePriority">
-    <Position X="9.5" Y="12.75" Width="2.25" />
+    <Position X="9.75" Y="12.75" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAAAAAAAAAIDAAAAAAAAAAAAAAAAACAA=</HashCode>
       <FileName>PreemptivePriority.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="SchedulerSimulator.Process">
-    <Position X="10.75" Y="1.25" Width="2" />
+    <Position X="10.5" Y="1.25" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAoAAAEAAAAAAAEAAAAEAAAAAAAUAAAAAAAgAAAAAA=</HashCode>
       <FileName>Process.cs</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="SchedulerSimulator.ProcessControlBlock" BaseTypeListCollapsed="true">
-    <Position X="13.25" Y="1.25" Width="2" />
+    <Position X="12.75" Y="1.25" Width="2.25" />
     <TypeIdentifier>
-      <HashCode>BAAAAAkEAAAAAAAAAgAAAAAAAAAgAABBAAAAgAQAABA=</HashCode>
+      <HashCode>BAAAAAkEAAAAAAAIAgAAAAAAAAAgAABBAAAAgAQAABA=</HashCode>
       <FileName>ProcessControlBlock.cs</FileName>
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
   <Class Name="SchedulerSimulator.RoundRobin">
-    <Position X="12" Y="12.75" Width="2" />
+    <Position X="12.25" Y="12.75" Width="2" />
     <TypeIdentifier>
       <HashCode>AAgAAAAAAAAAAEAAAAAAAIDAAAAAAAAAAAAAAAAACAA=</HashCode>
       <FileName>RoundRobin.cs</FileName>

diff --git a/SchedulerSimulator/PreemptivePriority.cs b/SchedulerSimulator/PreemptivePriority.cs
@@ -31,7 +31,7 @@ protected override void Dispatch()
             {
                 if (workingPcb.RemainingBurstTime > 0)
                 {
-                    readyQueue.Add(workingPcb.Process.Priority, (ProcessControlBlock)workingPcb.Clone());
+                    readyQueue.Add(workingPcb.Process.Priority, workingPcb.Clone());
                 }
                 Timeout();
             }

diff --git a/SchedulerSimulator/ProcessControlBlock.cs b/SchedulerSimulator/ProcessControlBlock.cs
@@ -61,7 +61,7 @@ public int TurnaroundTime
 
         private int? turnaroundTime = null;
 
-        public object Clone() => new ProcessControlBlock
+        public ProcessControlBlock Clone() => new ProcessControlBlock
         {
             Process = Process,
             IsInitial = false,
@@ -71,5 +71,7 @@ public int TurnaroundTime
             ResponseTime = ResponseTime,
             WaitingTime = WaitingTime,
         };
+
+        object ICloneable.Clone() => Clone();
     }
 }
diff --git a/SchedulerSimulator/RoundRobin.cs b/SchedulerSimulator/RoundRobin.cs
@@ -36,7 +36,7 @@ protected override void Dispatch()
             {
                 if (workingPcb.RemainingBurstTime > 0)
                 {
-                    readyQueue.Enqueue((ProcessControlBlock)workingPcb.Clone());
+                    readyQueue.Enqueue(workingPcb.Clone());
                 }
                 Timeout();
             }

diff --git a/SchedulerSimulator/ShortestRemainingTimeFirst.cs b/SchedulerSimulator/ShortestRemainingTimeFirst.cs
@@ -31,7 +31,7 @@ protected override void Dispatch()
             {
                 if (workingPcb.RemainingBurstTime > 0)
                 {
-                    readyQueue.Add(workingPcb.RemainingBurstTime, (ProcessControlBlock)workingPcb.Clone());
+                    readyQueue.Add(workingPcb.RemainingBurstTime, workingPcb.Clone());
                 }
                 Timeout();
             }