|
@@ -11,9 +11,10 @@ private:
|
|
|
|
|
|
public:
|
|
public:
|
|
template <class value_class> Triangle(value_class A, value_class B, value_class C);
|
|
template <class value_class> Triangle(value_class A, value_class B, value_class C);
|
|
|
|
+ template <> Triangle(Point A, Point B, Point C);
|
|
template <class value_class> Triangle(value_class x1, value_class y1, value_class x2, value_class y2, value_class x3, value_class y3 );
|
|
template <class value_class> Triangle(value_class x1, value_class y1, value_class x2, value_class y2, value_class x3, value_class y3 );
|
|
Triangle();
|
|
Triangle();
|
|
- template <> Triangle(Point A, Point B, Point C);
|
|
|
|
|
|
+
|
|
|
|
|
|
double calc_area();
|
|
double calc_area();
|
|
double calc_perimeter();
|
|
double calc_perimeter();
|
|
@@ -49,7 +50,7 @@ inline Triangle::Triangle(value_class x1, value_class y1, value_class x2, value_
|
|
}
|
|
}
|
|
|
|
|
|
template <>
|
|
template <>
|
|
-Triangle::Triangle(Point A, Point B, Point C)
|
|
|
|
|
|
+inline Triangle::Triangle(Point A, Point B, Point C)
|
|
{
|
|
{
|
|
dots.push_back(A);
|
|
dots.push_back(A);
|
|
dots.push_back(B);
|
|
dots.push_back(B);
|