Очередная оптимизация

include/Form.hpp

@@ -14,7 +14,6 @@ protected:
 public:
     Form();
     virtual double Function(double, double);
-    virtual std::pair<double, double> Second_Deriative(double, double);
     virtual bool Inhere(double, double);
     virtual std::pair<double, double> missX(double); 
     virtual std::pair<double, double> missY(double); 

include/Primitives.hpp

@@ -15,7 +15,6 @@ private:
 public:
     Rectangle(double, double, double, double, bool, int);
     double Function(double, double) override;
-    std::pair<double, double> Second_Deriative(double, double) override;
     bool Inhere(double, double) override;
     std::pair<double, double> missX(double) override;
     std::pair<double, double> missY(double) override;
@@ -30,7 +29,6 @@ private:
 public:
     Circle(double, double, double, double, bool, int);
     double Function(double, double) override;
-    std::pair<double, double> Second_Deriative(double, double) override;
     bool Inhere(double, double) override;
     std::pair<double, double> missX(double) override;
     std::pair<double, double> missY(double) override;
@@ -46,7 +44,6 @@ private:
 public:
     Arc(double, double, double, double, bool, int);
     double Function(double, double) override;
-    std::pair<double, double> Second_Deriative(double, double) override;
     std::pair<double, double> missX(double) override;
     std::pair<double, double> missY(double) override;
     std::pair<double, double> size() override;

src/Form.cpp

@@ -6,10 +6,6 @@ double Form::Function(double, double) {
     return 0;
 }
 
-std::pair<double, double> Form::Second_Deriative(double, double) {
-    return { 0, 0 };
-}
-
 std::pair<double, double> Form::size() {
     return { 0, 0 };
 }

src/Primitives.cpp

@@ -20,10 +20,6 @@ double Rectangle::Function(double _x, double _y) {
     return std::max(h_x * std::abs(_x - x), h_y * std::abs(_y - y));
 }
 
-std::pair<double, double> Rectangle::Second_Deriative(double _x, double _y) {
-    return { (h_x / 2) * ((_x - x) / std::abs(_x - x)), (h_y / 2) * ((_y - y) / std::abs(_y - y)) };
-}
-
 bool Rectangle::Inhere(double x, double y) {
     return Function(x, y) <= EPS_RECTANGLE;
 }
@@ -44,10 +40,6 @@ double Circle::Function(double _x, double _y) {
     return pow(h_x * (_x - x), 2) + pow(h_y * (_y - y), 2);
 }
 
-std::pair<double, double> Circle::Second_Deriative(double _x, double _y) {
-    return { 2 * h_x * (_x - x), 2 * h_y * (_y - y) };
-}
-
 std::pair<double, double> Circle::size() {
     return { 1 / h_x, 1 / h_y };
 }
@@ -75,19 +67,6 @@ double Arc::Function(double _x, double _y) {
     return -1.0;
 }
 
-std::pair<double, double> Arc::Second_Deriative(double _x, double _y) {
-    if (_x >= x && _y >= y) {
-        return { 2 * h_x * (_x - x), 2 * h_y * (_y - y) };
-    }
-    if (_x < x) {
-        //std::cout << "_x < a\n";
-    }
-    if (_y < y) {
-        //std::cout << "_y < b\n";
-    }
-    return { -1.0, -1.0 };
-}
-
 std::pair<double, double> Arc::size() {
     return { 1 / h_x, 1 / h_y };
 }

src/main.cpp

@@ -17,7 +17,7 @@
 //#define HOLE_Y 255.
 //#define HOLE_RADIUS 50.
 
-#define CONDUCTIVITY 50. // Теплопроводность материала
+#define CONDUCTIVITY 100. // Теплопроводность материала
 
 void visualize(std::ofstream& file, std::string filename, int time_end) {
 	file << "set cbrange [" << 0 << ":" << 100 << "]" << std::endl;