Merge pull request #7 from sandialabs/dev

Further updates for the 1.1.1 release

doc/build_doc.sh

@@ -28,9 +28,9 @@ if [[ $1 == "poek" ]]; then
     echo "Building poek documentation with cmake";
     mkdir _build
     cd _build
-    conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd ../rtd/bin/cmake -Dwith_docs=ON -Dwith_python=ON ..
-    conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make install_tpls
-    conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make VERBOSE=1
-    conda run -p /home/docs/checkouts/readthedocs.org/user_builds/poek/checkouts/dev/rtd make doc_poek
+    conda run -p ../rtd ../rtd/bin/cmake -Dwith_docs=ON -Dwith_python=ON ..
+    conda run -p ../rtd make install_tpls
+    conda run -p ../rtd make VERBOSE=1
+    conda run -p ../rtd make doc_poek
     mv lib/poek/doc/sphinx ../_readthedocs/html
 fi

lib/coek/coek/api/constraint.cpp

@@ -1,3 +1,4 @@
+#include "../ast/base_terms.hpp"
 #include "../ast/constraint_terms.hpp"
 #include "../ast/expr_terms.hpp"
 #include "../ast/value_terms.hpp"

lib/coek/coek/api/expression.cpp

@@ -1,10 +1,10 @@
-#include "coek/api/expression.hpp"
-
+#include "../ast/base_terms.hpp"
 #include "../ast/constraint_terms.hpp"
 #include "../ast/expr_terms.hpp"
 #include "../ast/value_terms.hpp"
 #include "../ast/visitor_fns.hpp"
 #include "../ast/ast_operators.hpp"
+#include "coek/api/expression.hpp"
 
 namespace coek {
 

lib/coek/coek/api/expression_visitor.cpp

@@ -1,3 +1,4 @@
+#include "../ast/base_terms.hpp"
 #include "../ast/constraint_terms.hpp"
 #include "../ast/value_terms.hpp"
 #include "../ast/visitor_fns.hpp"

lib/coek/coek/ast/constraint_terms.cpp

@@ -1,6 +1,5 @@
-#include "constraint_terms.hpp"
-
 #include "base_terms.hpp"
+#include "constraint_terms.hpp"
 
 namespace coek {
 

lib/coek/coek/ast/constraint_terms.hpp

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <string>
-
 #include "base_terms.hpp"
 
 namespace coek {

lib/coek/coek/autograd/cppad_repn.cpp

@@ -1,5 +1,6 @@
 #include <unordered_map>
 
+#include "../ast/base_terms.hpp"
 #include "../ast/constraint_terms.hpp"
 #include "../ast/expr_terms.hpp"
 #include "../ast/value_terms.hpp"

lib/coek/coek/model/writer_nl.cpp

@@ -14,6 +14,7 @@
 #    include <fmt/os.h>
 #endif
 
+#include "../ast/base_terms.hpp"
 #include "../ast/constraint_terms.hpp"
 #include "../ast/expr_terms.hpp"
 #include "../ast/value_terms.hpp"