Skip to content

48 Re-increment unique names if already exists #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2024
Merged

48 Re-increment unique names if already exists #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/easyscience/Objects/ObjectClasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,11 @@ def _unique_name_generator(self) -> str:
"""
class_name = self.__class__.__name__
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
return class_name + "_" + iterator_string
name = class_name + "_" + iterator_string
while name in self._global_object.map.vertices():
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
name = class_name + "_" + iterator_string
return name

def __dir__(self) -> Iterable[str]:
"""
Expand Down
6 changes: 5 additions & 1 deletion src/easyscience/Objects/Variable.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,11 @@ def _unique_name_generator(self) -> str:
"""
class_name = self.__class__.__name__
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
return class_name + "_" + iterator_string
name = class_name + "_" + iterator_string
while name in self._global_object.map.vertices():
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
name = class_name + "_" + iterator_string
return name


# @cached_property
Expand Down
6 changes: 5 additions & 1 deletion src/easyscience/Objects/new_variable/descriptor_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ def _unique_name_generator(self) -> str:
"""
class_name = self.__class__.__name__
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
return class_name + "_" + iterator_string
name = class_name + "_" + iterator_string
while name in self._global_object.map.vertices():
iterator_string = str(self._global_object.map._get_name_iterator(class_name))
name = class_name + "_" + iterator_string
return name

@property
@abc.abstractmethod
Expand Down
11 changes: 10 additions & 1 deletion tests/unit_tests/Objects/new_variable/test_descriptor_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,17 @@ def test_as_data_dict(self, clear, descriptor: DescriptorBase):
}

def test_unique_name_generator(self, clear, descriptor: DescriptorBase):
# When Then Expect
# When
second_descriptor = DescriptorBase(name="test", unique_name="DescriptorBase_2")

# Then
third_descriptor = DescriptorBase(name="test2")
fourth_descriptor = DescriptorBase(name="test3")

# Expect
assert descriptor.unique_name == "DescriptorBase_0"
assert third_descriptor.unique_name == "DescriptorBase_1"
assert fourth_descriptor.unique_name == "DescriptorBase_3"

def test_unique_name_change(self, clear, descriptor: DescriptorBase):
# When Then
Expand Down
Loading