Renaming

include/Form.hpp

@@ -7,9 +7,9 @@
 
 class Form {
 protected:
-    static size_t counter_;
-    size_t id_;
-    bool excluded_;
+    static size_t counter;
+    size_t id;
+    bool excluded;
     int bound_type;
 public:
     Form();

include/Mesh.hpp

@@ -6,11 +6,11 @@
 #include "Node.hpp"
 
 class Mesh{
-	std::vector<std::vector<Node*>> _mesh;
-	std::vector<Node*> _hlines;
-	std::vector<Node*> _vlines;
-	Object& _obj;
-	double _step;
+	std::vector<std::vector<Node*>> mesh;
+	std::vector<Node*> hlines;
+	std::vector<Node*> vlines;
+	Object& obj;
+	double step;
 	void LinkX();
 	void LinkY();
 	void Delnode(int, int);
@@ -21,9 +21,9 @@ public:
 	~Mesh();
 	//void ShowLinks();
 
-	std::vector<std::vector<Node*>>& Nodes() { return _mesh; }
-	std::vector<Node*>& LineX() { return _hlines; }
-	std::vector<Node*>& LineY() { return _vlines; }
+	std::vector<std::vector<Node*>>& Nodes() { return mesh; }
+	std::vector<Node*>& LineX() { return hlines; }
+	std::vector<Node*>& LineY() { return vlines; }
 };
 
 #endif

include/Node.hpp

@@ -4,17 +4,17 @@
 #include <cmath>
 
 class Node{
-	double _x;
-	double _y;
-	double _t;
-	int _btype;
+	double x;
+	double y;
+	double t;
+	int btype;
 	
-	Node* _left;
-	Node* _right;
-	Node* _above;
-	Node* _below;
+	Node* left;
+	Node* right;
+	Node* above;
+	Node* bellow;
 public:
-	Node(double x = 0., double y = 0., int type = 0., double t = 0.): _x(x), _y(y), _t(t), _left(nullptr), _right(nullptr), _above(nullptr), _below(nullptr), _btype(type) {}
+	Node(double _x = 0., double _y = 0., int _type = 0., double _t = 0.): x(_x), y(_y), t(_t), left(nullptr), right(nullptr), above(nullptr), bellow(nullptr), btype(_type) {}
 	
 	double T() const;
 	double X() const;

include/Object.hpp

@@ -6,9 +6,9 @@
 
 class Object {
 private:
-    std::vector<Form*> forms_;
-    double _w;
-    double _h;
+    std::vector<Form*> forms;
+    double w;
+    double h;
     void Updsize();
 public:
     Object();

include/Primitives.hpp

@@ -8,10 +8,10 @@
 
 class Rectangle : public Form {
 private:
-    double a_;
-    double b_;
-    double h_x_;
-    double h_y_;
+    double x;
+    double y;
+    double h_x;
+    double h_y;
 public:
     Rectangle(double, double, double, double, bool, int);
     double Function(double, double) override;
@@ -23,10 +23,10 @@ public:
 };
 class Circle : public Form {
 private:
-    double a_;
-    double b_;
-    double h_x_;
-    double h_y_;
+    double x;
+    double y;
+    double h_x;
+    double h_y;
 public:
     Circle(double, double, double, double, bool, int);
     double Function(double, double) override;
@@ -39,10 +39,10 @@ public:
 
 class Arc : public Form {
 private:
-    double a_;
-    double b_;
-    double h_x_;
-    double h_y_;
+    double x;
+    double y;
+    double h_x;
+    double h_y;
 public:
     Arc(double, double, double, double, bool, int);
     double Function(double, double) override;

include/System.hpp

@@ -5,11 +5,11 @@
 
 class System{
 	Object& _obj;
-	Mesh _mesh;
+	Mesh mesh;
 	double _a;
 	double _step;
 public:
-System(Object& obj, double step = 10., double a1 = 1.): _obj(obj), _mesh(obj, step), _a(a1), _step(step) {}
+System(Object& obj, double step = 10., double a1 = 1.): _obj(obj), mesh(obj, step), _a(a1), _step(step) {}
 	void DefineBounds(int, int, int, int);
 	std::vector<std::vector<Node*>>& Nodes();
 	std::vector<Node*>& LineX();