try to fix travis-ci #2

willsheffler · Oct 6, 2017 · a3d0fef · a3d0fef
1 parent f9ceb28
commit a3d0fef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -149,7 +149,7 @@ install:
   - echo "!!!!!! travis.yml install using pip $PIP"
   - echo "!!!!!! travis.yml install using python $PYTHON"
   - head $PIP
-  - pip3 install -rrequirements.txt codecov
+  - $PIP install -rrequirements.txt codecov
   - pip install jinja2
   - pip2 install jinja2
   - if [ $(which pip3) ]; then pip3 install jinja2; fi

diff --git a/src/rif/hash/XformHash.hpp b/src/rif/hash/XformHash.hpp
@@ -153,7 +153,7 @@ struct XformHash_bt24_BCC6 {
 };
 
 template <class _Xform>
-struct XformHash_bt24_BCC6_Phi : public XformHash_bt24_BCC6<_Xform> {
+struct XformAngHash_bt24_BCC6 : public XformHash_bt24_BCC6<_Xform> {
   using Key = uint64_t;
   using Xform = _Xform;
   using Float = typename Xform::Scalar;
@@ -168,10 +168,10 @@ struct XformHash_bt24_BCC6_Phi : public XformHash_bt24_BCC6<_Xform> {
   using I7 = rif::util::SimpleArray<7, uint64_t>;
   Grid7 grid7_;
   float phi_resl_;
-  static std::string name() { return "XformHash_bt24_BCC6_Phi"; }
-  XformHash_bt24_BCC6_Phi() {}
-  XformHash_bt24_BCC6_Phi(Float phi_resl, Float cart_resl, Float ang_resl,
-                          Float cart_bound = 256.0) {
+  static std::string name() { return "XformAngHash_bt24_BCC6"; }
+  XformAngHash_bt24_BCC6() {}
+  XformAngHash_bt24_BCC6(Float phi_resl, Float cart_resl, Float ang_resl,
+                         Float cart_bound = 256.0) {
     this->init(cart_resl, ang_resl, cart_bound);
     phi_resl_ = phi_resl_;
   }
@@ -203,6 +203,10 @@ struct XformHash_bt24_BCC6_Phi : public XformHash_bt24_BCC6<_Xform> {
   }
 };
 
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+/// below may be "out of date" XformHash_bt24_BCC6 is the "official" one.
+//////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 template <class _Xform>
 struct XformHash_Quat_BCC7_Zorder {
   typedef uint64_t Key;