ParkSuMin/MemMAPR-MKR
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Масштабное переобозначение

Browse Source 
Улучшение читаемости и понимания кода
This commit is contained in:
ParkSuMin
2025-05-14 18:00:22 +03:00
parent 8100f0d4e1
commit d55f8fa5d3
7 changed files with 57 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/Form.hpp
View File

@@ -10,18 +10,18 @@ protected:
static size_t counter_;
size_t id_;
bool excluded_;
int _boundtype;
int bound_type;
public:
Form();
virtual double Function(double, double);
virtual std::pair<double, double> Deriative(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);
virtual std::pair<double, double> size();
virtual int GetB();
bool Excluded() const;
bool operator==(size_t) const;
//bool operator==(size_t) const;
};
#endif

9
include/Primitives.hpp
View File

@@ -3,6 +3,9 @@
#include "Form.hpp"
#define EPS_RECTANGLE 0.5
#define EPS_CIRCLE 1
class Rectangle : public Form {
private:
double a_;
@@ -12,7 +15,7 @@ private:
public:
Rectangle(double, double, double, double, bool, int);
double Function(double, double) override;
std::pair<double, double> Deriative(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;
@@ -27,7 +30,7 @@ private:
public:
Circle(double, double, double, double, bool, int);
double Function(double, double) override;
std::pair<double, double> Deriative(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;
@@ -43,7 +46,7 @@ private:
public:
Arc(double, double, double, double, bool, int);
double Function(double, double) override;
std::pair<double, double> Deriative(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;

6
include/Solver.hpp
View File

@@ -9,10 +9,10 @@ class Solver{
double delta;
std::vector<double> ThomasMethod(std::vector<std::vector<double>>&, std::vector<double>&) const;
void SolveLine(System&, std::vector<Node*>&) const;
std::string _name_1;
std::string _name_2;
std::string filename_expl;
std::string filename_impl;
public:
Solver(std::string name_1, std::string name_2, double dt = 1.): delta(dt), _name_1(name_1), _name_2(name_2) {}
Solver(std::string name_1, std::string name_2, double dt = 1.): delta(dt), filename_expl(name_1), filename_impl(name_2) {}
void SolveExplicit(System&, double) const;
void SolveImplicit(System&, double) const;
};