lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 8044c50 1/7: Remove scaffolding


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 8044c50 1/7: Remove scaffolding
Date: Thu, 14 Jun 2018 10:27:40 -0400 (EDT)

branch: master
commit 8044c503327200fa89499c9742c10957815dd3f0
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Remove scaffolding
---
 census_view.cpp | 38 ++------------------------------------
 census_view.hpp |  5 -----
 2 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/census_view.cpp b/census_view.cpp
index 0b252f9..c2895f4 100644
--- a/census_view.cpp
+++ b/census_view.cpp
@@ -983,43 +983,9 @@ Input* CensusView::class_parms_from_class_name(std::string 
const& class_name)
 
 bool CensusView::column_value_varies_across_cells(std::string const& header) 
const
 {
-    bool const old =
-        (  column_value_varies_across_cells(header, class_parms())
-        || column_value_varies_across_cells(header, cell_parms ())
-        );
     auto const z = case_parms()[0][header];
-    for(auto const& j : class_parms())
-        {
-        if(z != j[header])
-            {
-            LMI_ASSERT(true == old);
-            return true;
-            }
-        }
-    for(auto const& j : cell_parms())
-        {
-        if(z != j[header])
-            {
-            LMI_ASSERT(true == old);
-            return true;
-            }
-        }
-    LMI_ASSERT(false == old);
-    return false;
-}
-
-bool CensusView::column_value_varies_across_cells
-    (std::string        const& header
-    ,std::vector<Input> const& cells
-    ) const
-{
-    for(auto const& j : cells)
-        {
-        if(!(j[header] == case_parms()[0][header]))
-            {
-            return true;
-            }
-        }
+    for(auto const& j : class_parms()) {if(z != j[header]) return true;}
+    for(auto const& j : cell_parms() ) {if(z != j[header]) return true;}
     return false;
 }
 
diff --git a/census_view.hpp b/census_view.hpp
index fccafb5..337fa0b 100644
--- a/census_view.hpp
+++ b/census_view.hpp
@@ -112,11 +112,6 @@ class CensusView final
     Input* class_parms_from_class_name(std::string const&);
 
     bool column_value_varies_across_cells(std::string const& header) const;
-    // retained for the nonce, for testing only:
-    bool column_value_varies_across_cells
-        (std::string        const& header
-        ,std::vector<Input> const& cells
-        ) const;
 
     oenum_mvc_dv_rc edit_parameters
         (Input&             parameters



reply via email to

[Prev in Thread] Current Thread [Next in Thread]