Some renaming

src/ngraph/length.cpp

@@ -18,7 +18,7 @@
 
 std::ostream& ngraph::operator<<(std::ostream& str, const Length& length)
 {
-    if (length.fixed())
+    if (length.is_determined())
     {
         return (str << size_t(length));
     }
@@ -30,5 +30,6 @@ std::ostream& ngraph::operator<<(std::ostream& str, const Length& length)
 
 ngraph::Length ngraph::operator+(const Length& l1, const Length& l2)
 {
-    return (l1.fixed() && l2.fixed() ? size_t(l1) + size_t(l2) : Length(undet));
+    return (l1.is_determined() && l2.is_determined() ? size_t(l1) + size_t(l2)
+                                                     : Length(undetermined));
 }

src/ngraph/length.hpp

@@ -29,24 +29,24 @@ namespace ngraph
     public:
         Length(size_t length)
             : m_length(length)
-            , m_fixed(true)
+            , m_is_determined(true)
         {
         }
         Length(const Undetermined&)
             : m_length(0)
-            , m_fixed(false)
+            , m_is_determined(false)
         {
         }
         Length()
             : m_length(0)
-            , m_fixed(true)
+            , m_is_determined(true)
         {
         }
-        bool fixed() const { return m_fixed; }
+        bool is_determined() const { return m_is_determined; }
         explicit operator size_t() const { return m_length; }
     private:
         size_t m_length;
-        bool m_fixed;
+        bool m_is_determined;
     };
 
     std::ostream& operator<<(std::ostream& str, const Length& length);

src/ngraph/partial_shape.cpp

@@ -21,18 +21,18 @@
 
 using namespace ngraph;
 
-bool ngraph::PartialShape::fixed() const
+bool ngraph::PartialShape::is_complete() const
 {
-    return m_rank_fixed && std::all_of(m_lengths.begin(), m_lengths.end(), [](const Length& l) {
-               return l.fixed();
-           });
+    return m_rank_is_determined && std::all_of(m_lengths.begin(),
+                                               m_lengths.end(),
+                                               [](const Length& l) { return l.is_determined(); });
 }
 
 ngraph::PartialShape ngraph::operator+(const PartialShape& s1, const PartialShape& s2)
 {
-    if (!s1.rank_fixed() || !s2.rank_fixed())
+    if (!s1.rank_is_determined() || !s2.rank_is_determined())
     {
-        return undet;
+        return undetermined;
     }
 
     if (s1.rank() != s2.rank())
@@ -41,7 +41,7 @@ ngraph::PartialShape ngraph::operator+(const PartialShape& s1, const PartialShap
     }
 
     PartialShape result{};
-    result.m_rank_fixed = true;
+    result.m_rank_is_determined = true;
     for (size_t i = 0; i < s1.m_lengths.size(); i++)
     {
         result.m_lengths.push_back(s1.m_lengths[i] + s2.m_lengths[i]);
@@ -51,7 +51,7 @@ ngraph::PartialShape ngraph::operator+(const PartialShape& s1, const PartialShap
 
 std::ostream& ngraph::operator<<(std::ostream& str, const PartialShape& shape)
 {
-    if (shape.m_rank_fixed)
+    if (shape.m_rank_is_determined)
     {
         str << "{";
         bool first = true;

src/ngraph/partial_shape.hpp

@@ -29,24 +29,24 @@ namespace ngraph
     {
     public:
         PartialShape(std::initializer_list<Length> init)
-            : m_rank_fixed(true)
+            : m_rank_is_determined(true)
             , m_lengths(init)
         {
         }
         PartialShape(const Undetermined&)
-            : m_rank_fixed(false)
+            : m_rank_is_determined(false)
             , m_lengths()
         {
         }
-        bool rank_fixed() const { return m_rank_fixed; }
-        bool fixed() const;
-        Rank rank() const { return m_rank_fixed ? Rank(m_lengths.size()) : undet; }
+        bool rank_is_determined() const { return m_rank_is_determined; }
+        bool is_complete() const;
+        Rank rank() const { return m_rank_is_determined ? Rank(m_lengths.size()) : undetermined; }
         friend std::ostream& operator<<(std::ostream& str, const PartialShape& shape);
         friend PartialShape operator+(const PartialShape& s1, const PartialShape& s2);
         PartialShape append(const PartialShape& other);
 
     private:
-        bool m_rank_fixed;
+        bool m_rank_is_determined;
         std::vector<Length> m_lengths;
     };
 

src/ngraph/rank.cpp

@@ -18,7 +18,7 @@
 
 std::ostream& ngraph::operator<<(std::ostream& str, const Rank& rank)
 {
-    if (rank.fixed())
+    if (rank.is_fixed())
     {
         return (str << size_t(rank));
     }
@@ -30,10 +30,10 @@ std::ostream& ngraph::operator<<(std::ostream& str, const Rank& rank)
 
 bool ngraph::operator==(const Rank& r1, const Rank& r2)
 {
-    return (r1.fixed() && r2.fixed() && size_t(r1) == size_t(r2));
+    return (r1.is_fixed() && r2.is_fixed() && size_t(r1) == size_t(r2));
 }
 
 bool ngraph::operator!=(const Rank& r1, const Rank& r2)
 {
-    return (r1.fixed() && r2.fixed() && size_t(r1) != size_t(r2));
+    return (r1.is_fixed() && r2.is_fixed() && size_t(r1) != size_t(r2));
 }

src/ngraph/rank.hpp

@@ -42,7 +42,7 @@ namespace ngraph
             , m_fixed(true)
         {
         }
-        bool fixed() const { return m_fixed; }
+        bool is_fixed() const { return m_fixed; }
         explicit operator size_t() const { return m_rank; }
     private:
         size_t m_rank;

src/ngraph/undetermined.cpp

@@ -16,7 +16,6 @@
 
 #include "ngraph/undetermined.hpp"
 
-std::ostream& ngraph::operator<<(std::ostream& str, const Undetermined&)
-{
-    return (str << "?");
-}
+using namespace ngraph;
+
+const Undetermined ngraph::undetermined{};

src/ngraph/undetermined.hpp

@@ -26,10 +26,7 @@ namespace ngraph
     {
     public:
         Undetermined() {}
-        friend std::ostream& operator<<(std::ostream& str, const Undetermined&);
     };
 
-    std::ostream& operator<<(std::ostream& str, const Undetermined&);
-
-    const ngraph::Undetermined undet;
+    extern const Undetermined undetermined;
 }