Constructor Point with vector

programonauta · programonauta · commit 8d6a3f0c8ffc · 2019-03-08T12:57:33.000Z
diff --git a/point/main.cpp b/point/main.cpp
@@ -46,6 +46,12 @@ int main() {
       for (int j = 0; j < items[i].coord.size(); ++j)
         cout << "Item [" << i << "] [" << j << "] = " << items[i].coord[j] << endl;
 
+    cout << "Initialize with vector" << endl;
+
+    Point w({0.51, 10.45, 20.35});
+
+    cout << "Point w " << w << endl;
+
     return 0;
 }
 
diff --git a/point/point.cpp b/point/point.cpp
@@ -9,8 +9,8 @@ using namespace std;
 // Constructor
 Point::Point(int dimen) {
 
-  // Could not accept dimension less then 1, don't return an error, but set default
-  if (dimen < 1)
+  // Could not accept dimension less then 2, don't return an error, but set default
+  if (dimen < 2)
     dimen= 2;
 
   coord.resize(dimen);
@@ -19,6 +19,20 @@ Point::Point(int dimen) {
 
 } // Constructor
 
+Point::Point(vector<double> p_coord)
+{
+  coord = p_coord;
+  size_t dimen = coord.size();
+
+  if (dimen < 1)
+  {
+    coord.resize(2);
+    if (dimen == 0)
+      coord[0] = 0.0;
+    coord[1] = 0.0;
+  }
+}
+
 // Function to calculate distance to other point
 double Point::dist(Point other) {
   double sum = 0;
diff --git a/point/point.h b/point/point.h
@@ -19,6 +19,7 @@ class Point {
 
     // Constructor
     Point(int dimen = 2);
+    Point(vector<double> p_coord);
 
     // Function to calculate distance to other point
     double dist(Point other); 
diff --git a/vector/vectorArg.cpp b/vector/vectorArg.cpp
@@ -28,4 +28,7 @@ int main (int argc, char* argv[])
   for (int i = 0; i < s; i++)
     cout << names[i] << "\n";
 
+  for (string st : names)
+    cout << st << endl;
+
 }

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,7 @@ int main (int argc, char* argv[])`
`28`	`28`	`for (int i = 0; i < s; i++)`
`29`	`29`	`cout << names[i] << "\n";`
`30`	`30`
	`31`	`+ for (string st : names)`
	`32`	`+ cout << st << endl;`
	`33`	`+`
`31`	`34`	`}`