Skip to content

Commit 8bcd294

Browse files
committed
Refactored again.
1 parent 5aa882f commit 8bcd294

File tree

12 files changed

+18
-19
lines changed

12 files changed

+18
-19
lines changed

Calculator/Calculator/Program.cs

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ class Program
55
static void Main(string[] args)
66
{
77
PrintWelcomeMessage();
8-
98
string operatorSymbol = ChooseOperatorSymbol();
10-
119
int numberOfNumbers = ChooseNumberOfNumbers(operatorSymbol);
12-
13-
double calculationResult = PerformOneCalculation(numberOfNumbers, operatorSymbol);
10+
double[] userNumbers = EnterNumbers(numberOfNumbers);
11+
double calculationResult = PerformOneCalculation(numberOfNumbers, operatorSymbol, userNumbers);
12+
1413

1514
Console.WriteLine($"The answer to your calculation is: {calculationResult}");
1615

@@ -56,7 +55,7 @@ public static int ChooseNumberOfNumbers(string operatorSymbol)
5655
return int.Parse(userInput1);
5756
}
5857

59-
public static double PerformOneCalculation(int numberOfNumbers, string operatorSymbol)
58+
public static double[] EnterNumbers(int numberOfNumbers)
6059
{
6160
double[] numbers = new double[numberOfNumbers];
6261

@@ -67,29 +66,29 @@ public static double PerformOneCalculation(int numberOfNumbers, string operatorS
6766
double number = double.Parse(userInput2);
6867
numbers[i] = number;
6968
}
70-
71-
foreach (double number in numbers)
72-
{
73-
Console.WriteLine(number);
74-
}
75-
76-
double result = numbers[0];
69+
return numbers;
70+
}
71+
72+
public static double PerformOneCalculation(int numberOfNumbers, string operatorSymbol, double[] userNumbers)
73+
{
74+
75+
double result = userNumbers[0];
7776

7877
for (int i = 1; i < numberOfNumbers; i++)
7978
{
8079
switch (operatorSymbol)
8180
{
8281
case "+":
83-
result += numbers[i];
82+
result += userNumbers[i];
8483
break;
8584
case "-":
86-
result -= numbers[i];
85+
result -= userNumbers[i];
8786
break;
8887
case "x":
89-
result *= numbers[i];
88+
result *= userNumbers[i];
9089
break;
9190
case "/":
92-
result /= numbers[i];
91+
result /= userNumbers[i];
9392
break;
9493
default:
9594
break;
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
-4 Bytes
Binary file not shown.

Calculator/Calculator/obj/Debug/net9.0/Calculator.AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: System.Reflection.AssemblyCompanyAttribute("Calculator")]
1414
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
1515
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
16-
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+bb4e777b8a43630b6516f125529cc943c7c6beee")]
16+
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5aa882f6c7d08a07a5e4599ecef875543487c939")]
1717
[assembly: System.Reflection.AssemblyProductAttribute("Calculator")]
1818
[assembly: System.Reflection.AssemblyTitleAttribute("Calculator")]
1919
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
247bd62b5b49426f8260c35398dc348a3e92c9a9ed26c3ff6dccc522779b2eee
1+
547919f79659e7ee2be0a469cdc3734ed917e3df72dbd1443f2486612bfa8762
0 Bytes
Binary file not shown.
-4 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"documents":{"C:\\Users\\hanna\\RiderProjects\\CSharpPreReading\\*":"https://raw.githubusercontent.com/hduns/CSharpPreReading/bb4e777b8a43630b6516f125529cc943c7c6beee/*"}}
1+
{"documents":{"C:\\Users\\hanna\\RiderProjects\\CSharpPreReading\\*":"https://raw.githubusercontent.com/hduns/CSharpPreReading/5aa882f6c7d08a07a5e4599ecef875543487c939/*"}}
0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)