From 4e34878b7e6a51fa1ddc91a74689194eabf650fe Mon Sep 17 00:00:00 2001 From: MtDu Date: Sun, 1 Oct 2017 17:37:10 -0500 Subject: [PATCH] Renamed files according to desired file structure Fixes #25 --- .../java/linear_functions.java | 0 .../nth_root/java/nth_root.java | 0 .../java/quadratic_formula.java | 0 .../python/quadratic_formula.py | 0 ...ximation.java => euler_approximation.java} | 0 .../leibniz_formula/lua}/leibniz_formula.lua | 0 .../area_formulas/python/area_formulas.py | 0 .../distance_formula_3d.java | 0 .../python/distance_formula.py | 0 ...nFormula.java => pythagorean_theorem.java} | 0 .../triangles/java/right_triangle.java | 0 geometry/triangles/java/triangle.java | 0 .../volume_formulas/python/volume_formulas.py | 0 java/Geometry_Triangle_Formulas/Triangle.java | 51 ------------------- .../force_equation/java}/force_equation.java | 0 .../force_equation/python}/force_equation.py | 0 16 files changed, 51 deletions(-) rename java/Linear_Function_Formulas/LinearFunctions.java => algebra/linear_functions/java/linear_functions.java (100%) rename java/nth_root/NthRoot.java => algebra/nth_root/java/nth_root.java (100%) rename java/quadratic_formula/QuadraticFormula.java => algebra/quadratic_formula/java/quadratic_formula.java (100%) rename python/quadratic_formula/quadratic_forumula.py => algebra/quadratic_formula/python/quadratic_formula.py (100%) rename calculus/euler_approximation/java/{EulerApproximation.java => euler_approximation.java} (100%) rename {lua/leibniz_formula => calculus/leibniz_formula/lua}/leibniz_formula.lua (100%) rename python/geometry/area/area.py => geometry/area_formulas/python/area_formulas.py (100%) rename java/distance_formula/DistanceFormula3d.java => geometry/distance_formula/java/distance_formula_3d.java/distance_formula_3d.java (100%) rename python/geometry/2d/distance_equation.py => geometry/distance_formula/python/distance_formula.py (100%) rename geometry/pythagorean_theorem/java/{PythagoreanFormula.java => pythagorean_theorem.java} (100%) rename java/Geometry_Triangle_Formulas/RightTriangle.java => geometry/triangles/java/right_triangle.java (100%) create mode 100644 geometry/triangles/java/triangle.java rename python/geometry/volume/volume.py => geometry/volume_formulas/python/volume_formulas.py (100%) delete mode 100644 java/Geometry_Triangle_Formulas/Triangle.java rename {java/physics/force => physics/force_equation/java}/force_equation.java (100%) rename {python/physics/force => physics/force_equation/python}/force_equation.py (100%) diff --git a/java/Linear_Function_Formulas/LinearFunctions.java b/algebra/linear_functions/java/linear_functions.java similarity index 100% rename from java/Linear_Function_Formulas/LinearFunctions.java rename to algebra/linear_functions/java/linear_functions.java diff --git a/java/nth_root/NthRoot.java b/algebra/nth_root/java/nth_root.java similarity index 100% rename from java/nth_root/NthRoot.java rename to algebra/nth_root/java/nth_root.java diff --git a/java/quadratic_formula/QuadraticFormula.java b/algebra/quadratic_formula/java/quadratic_formula.java similarity index 100% rename from java/quadratic_formula/QuadraticFormula.java rename to algebra/quadratic_formula/java/quadratic_formula.java diff --git a/python/quadratic_formula/quadratic_forumula.py b/algebra/quadratic_formula/python/quadratic_formula.py similarity index 100% rename from python/quadratic_formula/quadratic_forumula.py rename to algebra/quadratic_formula/python/quadratic_formula.py diff --git a/calculus/euler_approximation/java/EulerApproximation.java b/calculus/euler_approximation/java/euler_approximation.java similarity index 100% rename from calculus/euler_approximation/java/EulerApproximation.java rename to calculus/euler_approximation/java/euler_approximation.java diff --git a/lua/leibniz_formula/leibniz_formula.lua b/calculus/leibniz_formula/lua/leibniz_formula.lua similarity index 100% rename from lua/leibniz_formula/leibniz_formula.lua rename to calculus/leibniz_formula/lua/leibniz_formula.lua diff --git a/python/geometry/area/area.py b/geometry/area_formulas/python/area_formulas.py similarity index 100% rename from python/geometry/area/area.py rename to geometry/area_formulas/python/area_formulas.py diff --git a/java/distance_formula/DistanceFormula3d.java b/geometry/distance_formula/java/distance_formula_3d.java/distance_formula_3d.java similarity index 100% rename from java/distance_formula/DistanceFormula3d.java rename to geometry/distance_formula/java/distance_formula_3d.java/distance_formula_3d.java diff --git a/python/geometry/2d/distance_equation.py b/geometry/distance_formula/python/distance_formula.py similarity index 100% rename from python/geometry/2d/distance_equation.py rename to geometry/distance_formula/python/distance_formula.py diff --git a/geometry/pythagorean_theorem/java/PythagoreanFormula.java b/geometry/pythagorean_theorem/java/pythagorean_theorem.java similarity index 100% rename from geometry/pythagorean_theorem/java/PythagoreanFormula.java rename to geometry/pythagorean_theorem/java/pythagorean_theorem.java diff --git a/java/Geometry_Triangle_Formulas/RightTriangle.java b/geometry/triangles/java/right_triangle.java similarity index 100% rename from java/Geometry_Triangle_Formulas/RightTriangle.java rename to geometry/triangles/java/right_triangle.java diff --git a/geometry/triangles/java/triangle.java b/geometry/triangles/java/triangle.java new file mode 100644 index 000000000..e69de29bb diff --git a/python/geometry/volume/volume.py b/geometry/volume_formulas/python/volume_formulas.py similarity index 100% rename from python/geometry/volume/volume.py rename to geometry/volume_formulas/python/volume_formulas.py diff --git a/java/Geometry_Triangle_Formulas/Triangle.java b/java/Geometry_Triangle_Formulas/Triangle.java deleted file mode 100644 index 30e69e32a..000000000 --- a/java/Geometry_Triangle_Formulas/Triangle.java +++ /dev/null @@ -1,51 +0,0 @@ -public class Triangle { - - public static final double DEGREES = 180d; - - /** - * - * Find area of triangle given base and height - * - * @param base - * @param height - * @return area of triangle - */ - public static double area(double base, double height){ - - return (base*height)/2; - - } - - /** - * - * Given the side angle side of triangle find area - * - * @param side1 - * @param side2 - * @param degrees - * @return area of triangle - */ - public static double area(double side1, double side2, double degrees){ - - return (side1*side2*Math.sin(degrees))/2; - - } - - /** - * - * Given 3 sides of a triangle find area using Heron's Formula - * - * @param side1 - * @param side2 - * @param side3 - * @return area of triangle - */ - public static double herons(double side1, double side2, double side3){ - - double s = (side1+side2+side3)/2; - - return Math.sqrt(s*(s-side1)*(s-side2)*(s-side3)); - - } - -} diff --git a/java/physics/force/force_equation.java b/physics/force_equation/java/force_equation.java similarity index 100% rename from java/physics/force/force_equation.java rename to physics/force_equation/java/force_equation.java diff --git a/python/physics/force/force_equation.py b/physics/force_equation/python/force_equation.py similarity index 100% rename from python/physics/force/force_equation.py rename to physics/force_equation/python/force_equation.py