diff --git a/synthesis/formula.py b/synthesis/formula.py index 6aa7cdb..4cc8fd9 100644 --- a/synthesis/formula.py +++ b/synthesis/formula.py @@ -44,7 +44,7 @@ class StructuralFormulaImageGenerator: pass @debug_log() - @retry(10, errors=ValueError) + @retry(100, errors=ValueError) def __generate_images_for_functional_group(self, smiles: Iterable[str], functional_group: str): AllChem.Compute2DCoords(self.templates[functional_group]) diff --git a/synthesis/segment/plot.py b/synthesis/segment/plot.py index 82698e3..4787f2f 100644 --- a/synthesis/segment/plot.py +++ b/synthesis/segment/plot.py @@ -40,7 +40,7 @@ class RandomPlot(RandomContentRectangle): self.generate_random_histogram, self.generate_random_pie_chart, self.generate_random_heat_map, - self.generate_random_structural_formula + self.generate_random_structural_formula, ] ) elif is_wide(rectangle): @@ -49,6 +49,7 @@ class RandomPlot(RandomContentRectangle): self.generate_random_line_plot, self.generate_random_histogram, self.generate_random_bar_plot, + self.generate_random_structural_formula, ] ) elif is_tall(rectangle): @@ -56,6 +57,7 @@ class RandomPlot(RandomContentRectangle): [ self.generate_random_bar_plot, self.generate_random_histogram, + self.generate_random_structural_formula, ] ) else: @@ -145,7 +147,8 @@ class RandomPlot(RandomContentRectangle): def generate_random_structural_formula(self, rectangle: Rectangle): image = generate_image_of_structural_formula(size=rectangle.size) - self.content = image if not self.content else superimpose(self.content, image) + if image: + self.content = image if not self.content else superimpose(self.content, image) def generate_plot_kwargs(self, keywords=None): diff --git a/synthesis/segment/segments.py b/synthesis/segment/segments.py index f644e6a..c0e729e 100644 --- a/synthesis/segment/segments.py +++ b/synthesis/segment/segments.py @@ -80,11 +80,11 @@ def generate_random_text_block(rectangle: Rectangle, n_sentences=None) -> Conten def generate_random_image_caption(rectangle: Rectangle) -> ContentRectangle: - return generate_random_caption(rectangle, f"Fig {rnd.randint(1, 20)}") + return generate_random_caption(rectangle, f"Fig. {rnd.randint(1, 20)}") def generate_random_table_caption(rectangle: Rectangle) -> ContentRectangle: - return generate_random_caption(rectangle, f"Tabl {rnd.randint(1, 20)}") + return generate_random_caption(rectangle, f"Tabl. {rnd.randint(1, 20)}") def generate_random_caption(rectangle: Rectangle, caption_start, n_sentences=None) -> ContentRectangle: diff --git a/synthesis/text/text_block_generator/caption.py b/synthesis/text/text_block_generator/caption.py index 78ff3bf..bac82a7 100644 --- a/synthesis/text/text_block_generator/caption.py +++ b/synthesis/text/text_block_generator/caption.py @@ -17,6 +17,6 @@ class CaptionGenerator(TextBlockGenerator): def generate_paragraph(self, rectangle, n_sentences): lines = generate_random_text_lines(rectangle, self.line_formatter, n_sentences) - first_line_modified = f"{self.caption_start}.: {first(lines)}" + first_line_modified = f"{self.caption_start}: {first(lines)}" lines = conj(first_line_modified, rest(lines)) return lines