diff --git a/lambeq/__init__.py b/lambeq/__init__.py index 2ff4c656..187962e4 100644 --- a/lambeq/__init__.py +++ b/lambeq/__init__.py @@ -61,6 +61,7 @@ 'bag_of_words_reader', 'cups_reader', 'spiders_reader', + 'spider_chain_reader', 'stairs_reader', 'word_sequence_reader', @@ -124,7 +125,7 @@ WebParseError, WebParser, Reader, LinearReader, TreeReader, TreeReaderMode, bag_of_words_reader, cups_reader, spiders_reader, - stairs_reader, word_sequence_reader) + spider_chain_reader, stairs_reader, word_sequence_reader) from lambeq.tokeniser import Tokeniser, SpacyTokeniser from lambeq.training import (Checkpoint, Dataset, Optimizer, NelderMeadOptimizer, RotosolveOptimizer, diff --git a/lambeq/text2diagram/__init__.py b/lambeq/text2diagram/__init__.py index a5debd31..04ae5be7 100644 --- a/lambeq/text2diagram/__init__.py +++ b/lambeq/text2diagram/__init__.py @@ -34,6 +34,7 @@ 'bag_of_words_reader', 'cups_reader', 'spiders_reader', + 'spider_chain_reader', 'stairs_reader', 'word_sequence_reader'] @@ -53,5 +54,6 @@ stairs_reader, word_sequence_reader) from lambeq.text2diagram.spiders_reader import (bag_of_words_reader, - spiders_reader) + spiders_reader, + spider_chain_reader) from lambeq.text2diagram.tree_reader import TreeReader, TreeReaderMode diff --git a/lambeq/text2diagram/spiders_reader.py b/lambeq/text2diagram/spiders_reader.py index 733b47da..7bb1dd5b 100644 --- a/lambeq/text2diagram/spiders_reader.py +++ b/lambeq/text2diagram/spiders_reader.py @@ -12,12 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -__all__ = ['SpidersReader', 'bag_of_words_reader', 'spiders_reader'] +__all__ = ['SpidersReader', 'bag_of_words_reader', + 'spiders_reader', 'spider_chain_reader'] from lambeq.backend.grammar import Diagram, Id, Spider, Word from lambeq.core.types import AtomicType from lambeq.core.utils import SentenceType, tokenised_sentence_type_check from lambeq.text2diagram.base import Reader +from lambeq.text2diagram.linear_reader import LinearReader S = AtomicType.SENTENCE @@ -46,3 +48,4 @@ def sentence2diagram(self, spiders_reader = SpidersReader() bag_of_words_reader = spiders_reader +spider_chain_reader = LinearReader(Spider(AtomicType.SENTENCE, 2, 1))