diff --git a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml index abd40db..7b0f5f1 100644 --- a/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml +++ b/Advanced Software Engineering/Advanced Software Engineering Tests/Advanced Software Engineering Tests.xml @@ -29,107 +29,107 @@ - tests the "move" command. See . + tests the "move" command. See . - tests the "moveto" command. See . + tests the "moveto" command. See . - tests the "drawto" command. See . + tests the "drawto" command. See . - tests the "line" command. See . + tests the "line" command. See . - tests the "lineto" command. See . + tests the "lineto" command. See . - tests the "regularpolygon" command. See . + tests the "regularpolygon" command. See . - tests the "rp" command. See . + tests the "rp" command. See . - tests the "regularpolygon" command. See . + tests the "regularpolygon" command. See . - tests the "rp" command. See . + tests the "rp" command. See . - tests the "square" command. See . + tests the "square" command. See . - tests the "square" command. See . + tests the "square" command. See . - tests the "quadrilateral" command using . See . + tests the "quadrilateral" command using . See . - Tests the "circle" command. See . + Tests the "circle" command. See . - tests the "triangle" command. See . + tests the "triangle" command. See . - tests the "triangle" command. See . + tests the "triangle" command. See . - test the "dot" command. See . + test the "dot" command. See . - tests the "clear" command. See . + tests the "clear" command. See . - Tests the "reset" command. See + Tests the "reset" command. See - Tests the "resetpen" command. See . + Tests the "resetpen" command. See . - Tests the command "pen". See + Tests the command "pen". See - Tests the command "fill". See . + Tests the command "fill". See . @@ -165,7 +165,7 @@ - This class tests methods. It uses a combination of manual and random tests. + This class tests methods. It uses a combination of manual and random tests. @@ -175,73 +175,73 @@ - Manual test + Manual test - Manual test + Manual test - Manual test. + Manual test. - Manual test. + Manual test. - Manual test. + Manual test. - Manual test. + Manual test. - Manual test. + Manual test. - Manual test. + Manual test. - Random test. + Random test. - This class tests methods. It uses a combination of manual and random tests. + This class tests methods. It uses a combination of manual and random tests. - Random test. + Random test. - Random test. + Random test. - Random test. + Random test. - Random test. + Random test. - + \ No newline at end of file diff --git a/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs b/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs index 247da35..98f0b31 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/HelperFunctions.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using System.Windows.Forms; namespace Advanced_Software_Engineering { diff --git a/Advanced Software Engineering/Advanced Software Engineering/MenuManager.cs b/Advanced Software Engineering/Advanced Software Engineering/MenuManager.cs index 8d12864..193b1ce 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/MenuManager.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/MenuManager.cs @@ -1,11 +1,9 @@ using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace Advanced_Software_Engineering { + public static partial class MenuManager { + /// /// The variable simply keep track of the windows that are currently shown (excluding ). /// @@ -22,4 +20,4 @@ namespace Advanced_Software_Engineering { } } } -} +} \ No newline at end of file diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs index 1d5bea2..e677772 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/DeclareVariable.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; namespace Advanced_Software_Engineering.Verbs.Value { @@ -10,9 +9,10 @@ namespace Advanced_Software_Engineering.Verbs.Value { //Common characters that people might try private char[] illegalCharacters = "1234567890!?/+- \"'@#~;:><,.`¬|[]{}\\£$%^&*()".ToCharArray(); - private string[] illegalNames = + + private string[] illegalNames = { "var", - "move", "moveto", + "move", "moveto", "drawto", "line", "lineto", "regularpolygon", "rp", "square", @@ -49,7 +49,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { this.drawer = drawer; //seperate assignment characters from everything else - foreach(string op in new string[]{ "=", "+", "-", "*", "/" }) { + foreach (string op in new string[] { "=", "+", "-", "*", "/" }) { assignment = assignment.Replace(op, " " + op + " "); } @@ -64,7 +64,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { //seperate on spaces string[] assignmentStrings = HelperFunctions.StripStringArray(assignment.Split(" "[0])).ToArray(); - + //check if is actually assignment if (!(assignmentStrings[1] == "=")) throw new Exception("No assignment in " + assignment); @@ -73,7 +73,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { if (!CheckName(name)) throw new Exception("'" + name + "' name not allowed"); //for single number assignments ["i", "=", "20"] - if (assignmentStrings.Length == 3) value = ValueFactory.CreateValue(drawer, assignmentStrings[2]); + if (assignmentStrings.Length == 3) value = ValueFactory.CreateValue(drawer, assignmentStrings[2]); //for expressions ["i", "=", "20", "+", "30"] //or some comparisons ["i", "=", "20", ">", "30"] @@ -97,7 +97,6 @@ namespace Advanced_Software_Engineering.Verbs.Value { throw new Exception("Not implemented yet"); } } - } public void ExecuteVerb() { diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs index aa94c16..883f8d8 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/Value/ValueTypes/ExpressionValue.cs @@ -26,7 +26,7 @@ namespace Advanced_Software_Engineering.Verbs.Value { } public ExpressionValue(Drawer drawer, IValue variable1, IValue variable2, string operation) { - switch(operation) { + switch (operation) { case "+": this.operation = ADD; break; @@ -49,7 +49,6 @@ namespace Advanced_Software_Engineering.Verbs.Value { this.variable1 = variable1; this.variable2 = variable2; - //Check for bad input if (this.operation > 3 && this.operation < 0) throw new Exception("Bad operation"); diff --git a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs index 428ed6e..4099efb 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Verbs/VerbFactory.cs @@ -30,7 +30,6 @@ namespace Advanced_Software_Engineering { //check for names in directory if (drawer.CheckVariableExists(command)) { - if (commandParameters.Length == 1) { return new UpdateVariable(drawer, command, ValueFactory.CreateValue(drawer, commandParameters[0])); } else throw new Exception(command + "needs something to be assigned to it");