Merge pull request #49 from LBL-EESA/conditional_issue_48

Implement the fix proposed by @jackrolph. Closes #48 - thank you!

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.1
+current_version = 2.1.2
 commit = True
 tag = True
 

REVISION

@@ -1 +1 @@
-2.1.1
+2.1.2

src/fastkde/fastKDE.py

@@ -1433,15 +1433,10 @@ def underlyingFunction(x,x0=305,y0=200,yrange=4):
                     )
                 )
 
-        # reorder the variable names so that the conditioning variables are first
-        var_names = (
-            var_names[len(conditioningVars) :] + var_names[: len(conditioningVars)]
-        )
-
     # extract the conditioning variable names
-    conditioning_var_names = var_names[len(conditioningVars) :]
+    conditioning_var_names = var_names[:len(conditioningVars)]
     # extract the input variable names
-    input_var_names = var_names[: len(conditioningVars)]
+    input_var_names = var_names[len(conditioningVars):]
 
     # Estimate the full joint PDF
     _pdf = fastKDE(npy.array(fullVarList), positive_shift=positive_shift, **kwargs)