diff --git a/TMI-practicum/Circle.cs b/TMI-practicum/Circle.cs index 46ba3a8..7c71853 100644 --- a/TMI-practicum/Circle.cs +++ b/TMI-practicum/Circle.cs @@ -21,14 +21,12 @@ namespace TMI_practicum return Math.Round(Math.Sqrt(Math.Pow(X - otherCircle.X, 2) + Math.Pow(Y - otherCircle.Y, 2)), 15); } - public - IEnumerable FindIntersections(Circle c1) + public IEnumerable FindIntersections(Circle c1) { IList intersections; double d = Distance(c1); - if (d > R + c1.R || d < Math.Abs(R - c1.R) || d == 0.0 && R - c1.R == 0.0) return null; + if (d > R + c1.R || d < Math.Abs(R - c1.R) || (d == 0.0 && R - c1.R == 0.0)) return null; - double a = Math.Round((R * R - c1.R * c1.R + d * d) / (2.0*d), 15); double px = Math.Round(X + a * (c1.X - X) / d, 15); double py = Math.Round(Y + a * (c1.Y - Y) / d, 15); diff --git a/TMI-practicum/Program.cs b/TMI-practicum/Program.cs index 020e9ce..b89ffd7 100644 --- a/TMI-practicum/Program.cs +++ b/TMI-practicum/Program.cs @@ -52,7 +52,7 @@ namespace TMI_practicum private static (byte Algorithm, int NbCircles, IList Circles) ParseFile(string path) { - byte algoritm = 0; + byte algorithm = 0; int nbCircles = 0; Circle[] circles = null; @@ -60,7 +60,7 @@ namespace TMI_practicum { try { - algoritm = byte.Parse(file.ReadLine()); + algorithm = byte.Parse(file.ReadLine()); nbCircles = int.Parse(file.ReadLine()); circles = new Circle[nbCircles]; string line; @@ -79,7 +79,7 @@ namespace TMI_practicum } } - return (algoritm, nbCircles, circles); + return (algorithm, nbCircles, circles); } private const string OutputFile = "output.txt";