Merge pull request #44 from theislab/feature/lr_encoder

skeleton for LR encoding ED model with extension of estimator
theislab · Nov 7, 2021 · 92647bf · 92647bf
2 parents b8b5be0 + bd2f900
commit 92647bf
Show file tree

Hide file tree

Showing 26 changed files with 1,137 additions and 425 deletions.
diff --git a/.cookietemple.yml b/.cookietemple.yml
@@ -15,5 +15,5 @@ full_name: Anna Schaar
 email: [email protected]
 project_name: ncem
 project_short_description: ncem. Learning cell communication from spatial graphs of cells.
-version: 0.4.6
+version: 0.4.8
 license: BSD-3-Clause
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -1,5 +1,10 @@
-name-template: "0.4.6 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
-tag-template: 0.4.6 # <<COOKIETEMPLE_FORCE_BUMP>>
+<<<<<<< HEAD
+name-template: "0.4.8 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
+tag-template: 0.4.8 # <<COOKIETEMPLE_FORCE_BUMP>>
+=======
+name-template: "0.4.8 🌈" # <<COOKIETEMPLE_FORCE_BUMP>>
+tag-template: 0.4.8 # <<COOKIETEMPLE_FORCE_BUMP>>
+>>>>>>> a602092480da26e9dd2e6cdfea66a485b515f277
 categories:
  - title: "🚀 Features"
  labels:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+**.DS_Store
+ncem/unit_test/temp
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

diff --git a/cookietemple.cfg b/cookietemple.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.6
+current_version = 0.4.8
 
 [bumpversion_files_whitelisted]
 init_file = ncem/__init__.py

diff --git a/docs/conf.py b/docs/conf.py
@@ -73,9 +73,9 @@
 # the built documents.
 #
 # The short X.Y version.
-version = "0.4.6"
+version = "0.4.8"
 # The full version, including alpha/beta/rc tags.
-release = "0.4.6"
+release = "0.4.8"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/ncem/__init__.py b/ncem/__init__.py
@@ -8,4 +8,4 @@
 __maintainer__ = ", ".join(["Anna C. Schaar", "David S. Fischer"])
 __author__ = ", ".join(["Anna C. Schaar", "David S. Fischer"])
 __email__ = ", ".join(["[email protected]", "[email protected]"])
-__version__ = "0.4.6"
+__version__ = "0.4.8"
diff --git a/ncem/api/train/__init__.py b/ncem/api/train/__init__.py
@@ -1,6 +1,6 @@
 """Initializes a train object in api."""
 from ncem.estimators import (Estimator, EstimatorCVAE, EstimatorCVAEncem,
- EstimatorED, EstimatorEDncem, EstimatorGraph,
+ EstimatorED, EstimatorEDncem, EstimatorEdNcemNeighborhood, EstimatorGraph,
  EstimatorInteractions, EstimatorLinear,
  EstimatorNoGraph)
 from ncem.models import BetaScheduler