Merge pull request #55 from sandialabs/dev-weh

Re-merging recent updates

Author: whart222

.clang-format

@@ -1,7 +1,8 @@
 ---
   BasedOnStyle: Google
   AlignTrailingComments: 'true'
-  AllowAllParametersOfDeclarationOnNextLine: 'false'
+  AllowAllArgumentsOnNextLine: 'true'
+  AllowAllParametersOfDeclarationOnNextLine: 'true'
   AlwaysBreakTemplateDeclarations: 'Yes'
   BreakBeforeBraces: Stroustrup
   ColumnLimit: 100

ChangeLog.md

@@ -4,6 +4,17 @@ Here we list changes of Coek.  More detailed information
 about incremental changes can be found in the [commit
 history](https://github.com/sandialabs/coek/commits).
 
+## 1.5.dev
+
+* coek_utils: Python utilities that work with coek
+* coek: Added tictoc and DataPortals logic
+* coek: Added new template type utilities
+* coek: Using std::to_string to standardize coek tests
+* poek: Test updates based on standardized coek test outputs
+* pycoek: Various API additions to improve pyomo_coek compatibility with pyomo
+* pyomo_coek: Various changes to improve compatibility with pyomo
+* pyomo_coek: Added tests for compatibility with pyomo
+
 ## 1.4
 
 * Added support for multithreaded model creation.

lib/CMakeLists.txt

@@ -29,10 +29,16 @@ if(${with_python})
     # Targets for poek testing
     #
     if(${with_tests})
-        list(APPEND lib_test_targets "test_poek")
+        list(APPEND lib_test_targets test_poek test_pyomo test_coek_utils)
         add_custom_target(test_poek
             COMMAND ${Python_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/poek/poek
             )
+        add_custom_target(test_coek_utils
+            COMMAND ${Python_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/coek_utils/coek_utils
+            )
+        add_custom_target(test_pyomo
+            COMMAND ${Python_EXECUTABLE} -m pytest ${CMAKE_CURRENT_SOURCE_DIR}/pyomo_coek/pyomo_coek
+            )
     endif()
     #
     # Targets for poek documentation
@@ -86,6 +92,16 @@ else()
     message("Ignoring lib/pyomo_coek")
 endif()
 
+message("")
+if(${with_python})
+    message("Configuring lib/coek_utils install")
+    add_custom_target(pip_install_coek_utils ALL
+        COMMAND ${Python_EXECUTABLE} -m pip install -e ${CMAKE_CURRENT_SOURCE_DIR}/coek_utils
+        )
+else()
+    message("Ignoring lib/coek_utils")
+endif()
+
 #
 # Lib test targets
 #

lib/coek/coek/CMakeLists.txt

@@ -4,6 +4,7 @@
 SET(sources
     util/index_vector.cpp
     util/option_cache.cpp
+    util/tictoc.cpp
     ast/base_terms.cpp
     ast/constraint_terms.cpp
     ast/value_terms.cpp
@@ -45,6 +46,7 @@ if (CMAKE_CXX_STANDARD GREATER_EQUAL 17)
         api/variable_array.cpp
         api/constraint_map.cpp
         api/subexpression_map.cpp
+        util/DataPortal.cpp
         )
 endif()
 
@@ -228,6 +230,8 @@ install(FILES
         util/template_utils.hpp
         util/sequence.hpp
         util/option_cache.hpp
+        util/DataPortal.hpp
+        util/tictoc.hpp
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/coek/util
         )
 install(FILES

lib/coek/coek/ast/visitor_to_list.cpp

@@ -70,11 +70,7 @@ void visit_MonomialTerm(const expr_pointer_t& expr, std::list<std::string>& repr
     auto tmp = safe_pointer_cast<MonomialTerm>(expr);
     repr.push_back("[");
     repr.push_back("*");
-    {
-        std::stringstream sstr;
-        sstr << tmp->coef;
-        repr.push_back(sstr.str());
-    }
+    repr.push_back(std::to_string(tmp->coef));
     if (tmp->var->name.size() == 0) {
         // WEH - It's hard to test this logic, since the variable index is dynamically generated
         // GCOVR_EXCL_START

lib/coek/coek/model/writer_lp.cpp

@@ -590,9 +590,9 @@ void LPWriter::print_constraint(fmt::ostream& ostr, const Constraint& c, size_t
     }
     else {
         print_repn(ostr, expr, vid);
-        //CALI_MARK_BEGIN("ELSE");
+        // CALI_MARK_BEGIN("ELSE");
         ostr.print(fmt::format(eq_fmt, lower.value() - tmp));
-        //CALI_MARK_END("ELSE");
+        // CALI_MARK_END("ELSE");
     }
 }