Merge pull request #155 from mrshirts/warning

changes to warning to make clear what is deprecated.
choderalab · Jan 11, 2015 · c7a7bbc · c7a7bbc
2 parents d38f41a + 785acc9
commit c7a7bbc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pymbar/mbar.py b/pymbar/mbar.py
@@ -846,7 +846,7 @@ def computeExpectations(self, A_n, u_kn=None, output='averages', state_dependent
         dims = len(np.shape(A_n))
 
         if dims > 2:
-            print("expecting dim=2 (state_dependent=True) or dim=1 for (state_dependent=False) observables")
+            print("Warning: dim=3 for (state_dependent==True) matrices for observables and dim=2 for (state_dependent==False) observables are deprecated; we suggest you convert to NxK form instead of NxKxK form.")
 
         if not state_dependent:
             if dims==2: