#include "shape.hpp"

Shape::Shape():
        name_{},
        color_{0.0, 0.0, 0.0}
        {}

Shape::Shape(std::string const& name):
        name_{name},
        color_{1.0, 1.0, 1.0}
        {}

Shape::Shape(Color const& color):
        name_{},
        color_{color}
        {}

Shape::Shape(std::string const& name, Color const& color):
        name_{name},
        color_{color}
        {}

std::string Shape::getName() const {
        return name_;
}

Color Shape::getColor() const {
        return color_;
}

std::ostream& Shape::print(std::ostream& os) const {
        os << "Shape " << name_ << ", RGB: " << color_;
        return os;
}

/* virtual */ std::ostream& operator<<(std::ostream& os, Shape const& s) {
        s.print(os);
        return os;
}
#include "shape.hpp"

Shape::Shape():
        name_{},
        color_{0.0, 0.0, 0.0}
        {}

Shape::Shape(std::string const& name):
        name_{name},
        color_{1.0, 1.0, 1.0}
        {}

Shape::Shape(Color const& color):
        name_{},
        color_{color}
        {}

Shape::Shape(std::string const& name, Color const& color):
        name_{name},
        color_{color}
        {}

std::string Shape::getName() const {
        return name_;
}

Color Shape::getColor() const {
        return color_;
}

std::ostream& Shape::print(std::ostream& os) const {
        os << "Shape " << name_ << ", RGB: {" << color_.r << ", " << color_.g
        << ", " << color_.b << "}";
        return os;
}

std::ostream& operator<<(std::ostream& os, Shape const& s) {
        s.print(os);
        return os;
}
--- 
+++ 
@@ -29,12 +29,11 @@
 }
 
 std::ostream& Shape::print(std::ostream& os) const {
-        os << "Shape " << name_ << ", RGB: {" << color_.r << ", " << color_.g
-        << ", " << color_.b << "}";
+        os << "Shape " << name_ << ", RGB: " << color_;
         return os;
 }
 
-std::ostream& operator<<(std::ostream& os, Shape const& s) {
+/* virtual */ std::ostream& operator<<(std::ostream& os, Shape const& s) {
         s.print(os);
         return os;
 }
Switch to predefined color output.
