From 06f860e9496fd7d07d743f6a77b1697e4bfd4c3b Mon Sep 17 00:00:00 2001
From: Eric Dunipace <edunipace@mail.harvard.edu>
Date: Thu, 17 Mar 2022 10:40:12 +0000
Subject: [PATCH] version 1.0.2

---
 DESCRIPTION       | 15 ++++++++++-----
 MD5               |  4 ++--
 src/transport.cpp |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 7e54382..0e55f5c 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,9 +1,14 @@
 Package: approxOT
 Type: Package
 Title: Approximate and Exact Optimal Transport Methods
-Version: 1.0.1
-Date: 2022-01-07
-Author: Eric Dunipace
+Version: 1.0.2
+Date: 2022-03-16
+Authors@R: 
+    person("Eric", "Dunipace", 
+        role = c("aut", "cre"),
+        email = "edunipace@mail.harvard.edu",
+        comment = c(ORCID = "0000-0001-8909-213X"))
+Author: Eric Dunipace [aut, cre] (<https://orcid.org/0000-0001-8909-213X>)
 Maintainer: Eric Dunipace <edunipace@mail.harvard.edu>
 Description: R and C++ functions to perform exact and 
   approximate optimal transport. All C++ methods are linkable 
@@ -15,6 +20,6 @@ BugReports: https://github.com/ericdunipace/approxOT/issues
 Suggests: testthat (>= 2.1.0), transport
 RoxygenNote: 7.1.1
 NeedsCompilation: yes
-Packaged: 2022-01-12 23:42:18 UTC; eifer
+Packaged: 2022-03-17 02:43:34 UTC; eifer
 Repository: CRAN
-Date/Publication: 2022-01-14 11:52:53 UTC
+Date/Publication: 2022-03-17 11:40:12 UTC
diff --git a/MD5 b/MD5
index 7722d4f..56a400c 100644
--- a/MD5
+++ b/MD5
@@ -1,4 +1,4 @@
-0e09c8329eea4491e38e731aeb4e6748 *DESCRIPTION
+17dd4988b1c0c0176885aa3113f1ab4f *DESCRIPTION
 9fbdc692ea6fbaca50a7af68505b86fa *NAMESPACE
 6f99890dc04a2890d5e681cf2c38bebc *R/RcppExports.R
 38f63ac108c704c098adb38f4dc1bf1c *R/approxOT-package.R
@@ -71,7 +71,7 @@ b679a0824ac45bdc49bf90daed8c8510 *src/trans_randkhorn.cpp
 1d47e723a68bdaa7c8fbf2a4dde1b420 *src/trans_swap.cpp
 e4758bc972ae748200814c028b551124 *src/trans_univariate.cpp
 b4474ba7a38371a72a188fee5b0727c9 *src/trans_univariate_approx_pwr.cpp
-9b92dd5ad49a83fd5f7367116961b161 *src/transport.cpp
+3d404f4b5a8eadb3b4869e4ca30de75e *src/transport.cpp
 6ea5b2133bab675b93b3b6477af507da *src/utils.cpp
 6473d081693854b3ed38e877e1015295 *src/wasserstein.cpp
 f42704eb6cd1acfd149d06a89c47640e *tests/testthat.R
diff --git a/src/transport.cpp b/src/transport.cpp
index 9855be9..c7d0798 100644
--- a/src/transport.cpp
+++ b/src/transport.cpp
@@ -155,7 +155,7 @@ void transport(const matrix & A, const matrix & B, const double p, const double
   int M = B.cols();
   bool univ = false;
   
-  if ( method == "univariate" || ((A.rows() == 1) & (B.rows() == 1) & (N == M) ) ){
+  if ( method == "univariate" || ((A.rows() == 1) && (B.rows() == 1) && (N == M) ) ){
     univ = true;
   }
   if ( univ ) {