Skip to content
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.

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

1.0.0 alpha to develop staging #608

Draft
wants to merge 373 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
373 commits
Select commit Hold shift + click to select a range
8104df8
Ensure stupid ZAID parsing is always handled when parsing a ZAID.
MicahGale Oct 14, 2024
b0f1325
Updated fall through test for new default version.
MicahGale Oct 14, 2024
458de0e
Deprecated append to avoid confusion and find bugs.
MicahGale Oct 14, 2024
e2b1d5e
Moved away from old append.
MicahGale Oct 14, 2024
51336b1
New default!
MicahGale Oct 14, 2024
90f3dc0
Fixed attributeErrors.
MicahGale Oct 14, 2024
8abe109
Made parser more robust with all edge cases.
MicahGale Oct 14, 2024
261f096
Fixed name of attribute in test.
MicahGale Oct 14, 2024
726fcd9
Added references to materials in manual.
MicahGale Oct 15, 2024
1314a66
Merge branch 'develop' into mat_redesign
MicahGale Oct 15, 2024
7e52e65
Promoted all surfaces to be easier to access.
MicahGale Oct 17, 2024
05db8cb
Updated mat clone test for new material api.
MicahGale Oct 17, 2024
b1739da
Updated test to all setting mode with strings.
MicahGale Oct 22, 2024
d80a234
Fixed wierd bug in test that shouldn't exist.
MicahGale Oct 22, 2024
3c39e45
Fixed parser to not get confused by starting keyword.
MicahGale Oct 22, 2024
5b08ff0
Merge branch 'develop' into mat_redesign
MicahGale Oct 30, 2024
e6db073
Removed strenum because that's 3.11
MicahGale Nov 2, 2024
e3d21d1
Merge branch 'develop' into mat_redesign
MicahGale Nov 7, 2024
e00b287
Ensured number is checked for mat eq.
MicahGale Nov 7, 2024
c109919
Makred add children to problem as deprecated
MicahGale Nov 7, 2024
4bff505
Added add del hooks to numbered object collection.
MicahGale Nov 7, 2024
f991da5
Added system to auto-add children objects.
MicahGale Nov 7, 2024
d033070
Fully deprecated add_cell_children_to_problem.
MicahGale Nov 7, 2024
ec50490
Removed hashing support from surfaces.
MicahGale Nov 7, 2024
2065fc2
Added map for library suffix to particle types.
MicahGale Nov 7, 2024
1c3da53
Fixed bugs with import. Now infinite recursion issue.
MicahGale Nov 7, 2024
db593a2
Used only final character to calssify library.
MicahGale Nov 8, 2024
9aa37e6
Fixed basic errors breaking everything.
MicahGale Nov 8, 2024
952ad23
Added some default libraries default behavior.
MicahGale Nov 12, 2024
ce75b1a
Made method to figure out which library will be used.
MicahGale Nov 12, 2024
1efbbdc
Merge branch 'develop' into mat_redesign
MicahGale Nov 12, 2024
87503c7
Restricted property testing to subset of libraries due to library for…
MicahGale Nov 12, 2024
c3283f0
Updated num_object to use internal methods more, and fix a few bugs.
MicahGale Nov 12, 2024
c851242
Updated test to avoid reappending the same object.
MicahGale Nov 12, 2024
3c3a887
Removed use of halfspaces from get leaves.
MicahGale Nov 12, 2024
1a7501c
Added flag to add input to error only once.
MicahGale Nov 13, 2024
ab3c63a
Added error messages.
MicahGale Nov 13, 2024
8386623
Added child object adder filter mechanism.
MicahGale Nov 13, 2024
6facc4c
Added mechanism to not add cell children everytime.
MicahGale Nov 13, 2024
5374ca9
Removed strenum.
MicahGale Nov 13, 2024
2bc0d58
Split developer's guide into multiple files for clarity.
MicahGale Nov 13, 2024
e080d80
Started standards for writing doc strings.
MicahGale Nov 13, 2024
9d11eca
Avoide bug if treating material like a list.
MicahGale Nov 14, 2024
de8ef57
Removed deprecation marks. Added example example.
MicahGale Nov 14, 2024
8a6e0c0
Fixed removed old surfaces method to not hash surfaces.
MicahGale Nov 14, 2024
3fa8901
Fixed collection call.
MicahGale Nov 14, 2024
a15db9d
Avoid added material in test.
MicahGale Nov 14, 2024
716bc90
Updated MCNP problem to use proper surface removal.
MicahGale Nov 14, 2024
ae78b70
Fixed basic set logic implementation.
MicahGale Nov 14, 2024
f399753
Implemented eq for NumberedObjectCollection.
MicahGale Nov 14, 2024
3443f31
Updated test to not rely on hashing.
MicahGale Nov 14, 2024
6e91e34
Removed test call to deprecated function.
MicahGale Nov 14, 2024
98eaf6f
changed update surfs system to accept numbers.
MicahGale Nov 15, 2024
dfb3756
Fixed realiance on truthiness of materials.
MicahGale Nov 15, 2024
69da3f7
Made failfast profile.
MicahGale Nov 15, 2024
2ea69f9
Tried to clean up how geometry clone works. Still broken.
MicahGale Nov 15, 2024
a4df3f1
corrected geometries update.
MicahGale Nov 16, 2024
a862007
Don't let getting leaves when not linked to surfaces.
MicahGale Nov 16, 2024
0d0d298
Stop hashing surfaces!
MicahGale Nov 16, 2024
608ef1c
Removed sets from tests.
MicahGale Nov 16, 2024
0f0d9de
Made num object collection eq more robust.
MicahGale Nov 16, 2024
eeb3e10
Fixed cell remove_duplicate_surfaces.
MicahGale Nov 16, 2024
efbfa42
Fixed keys to yield nothing when empty and not None.
MicahGale Nov 17, 2024
128567e
Updated remove surfaces to work with cells officialy.
MicahGale Nov 17, 2024
e370858
Just don't allow setting geometry with no numbers.
MicahGale Nov 17, 2024
fdb59c9
updated geometry tests to have numbers.
MicahGale Nov 17, 2024
9a3389e
Switched test to cloning.
MicahGale Nov 17, 2024
9e7a535
Fixed comments setter and tests.
MicahGale Nov 17, 2024
d6d6d13
Made default libraries hold a syntax node.
MicahGale Nov 18, 2024
dafe5d4
ensured nuclide always has a syntax node.
MicahGale Nov 18, 2024
729f7b4
Worked to ensure that on material edits the syntax tree is updated.
MicahGale Nov 18, 2024
0cf3293
Simplified logic.
MicahGale Nov 18, 2024
de4c82e
Ensured that material syntax tree is always valid.
MicahGale Nov 18, 2024
d920f74
Reduced risk of arbitrary time to execute tests.
MicahGale Nov 18, 2024
ab36fcf
Fixed typo in link.
MicahGale Nov 18, 2024
791495a
Fixed failing doc examples.
MicahGale Nov 18, 2024
b90128b
Added documentation for new modules.
MicahGale Nov 18, 2024
6c7c065
Moved nuclide tests to own file.
MicahGale Nov 18, 2024
432eeb9
Added new features and fixed bugs in Library.
MicahGale Nov 18, 2024
b7f60b3
Tested Library.
MicahGale Nov 18, 2024
cd5097c
Moved back to class based test structure.
MicahGale Nov 18, 2024
84b5339
Tested default libraries.
MicahGale Nov 18, 2024
fa9906c
Allowed setting library with string.
MicahGale Nov 18, 2024
cb6f63e
Fixed how str converted to LibraryType.
MicahGale Nov 18, 2024
a2f47eb
Made LibraryType better for dict hashing.
MicahGale Nov 18, 2024
1a78f4e
Fixed issue with nuclide lt.
MicahGale Nov 18, 2024
c714784
Added docstrings. Tried to fix singleton pattern.
MicahGale Nov 19, 2024
47cbb84
Promoted library to top level.
MicahGale Nov 20, 2024
20c33d6
Moved away from metaclasses to make sphinx happy.
MicahGale Nov 20, 2024
9c52802
Added MCNP 6.3.1 manual.
MicahGale Nov 20, 2024
e9e15cd
Made autodoc prettier.
MicahGale Nov 20, 2024
026c8d6
added a lot more documentation on how nuclide/nucleus works.
MicahGale Nov 20, 2024
d196b8d
Added typehints.
MicahGale Nov 20, 2024
1cc34a4
Finished docs standards.
MicahGale Nov 20, 2024
4c10ad9
Update doc strings for material.
MicahGale Nov 20, 2024
927ac00
Wrote more doc strings.
MicahGale Nov 20, 2024
da2d235
Added doc strings and type enforcement.
MicahGale Nov 21, 2024
6183660
Added system to set/get fractions and nuclides one by one.
MicahGale Nov 21, 2024
9985b09
Fixed typos in docstrings.
MicahGale Nov 21, 2024
e48eb3f
Documented almost all of the new material.
MicahGale Nov 21, 2024
713112e
Finished refactor to weakref and var name.
MicahGale Nov 21, 2024
1fecc43
Escaped doc string breaking pytest.
MicahGale Nov 21, 2024
8bf5361
Added system to test material exports.
MicahGale Nov 21, 2024
23dbbc0
Created system to do default material export formatting.
MicahGale Nov 22, 2024
3883295
Made all objects parsable from a bare string.
MicahGale Nov 22, 2024
013d15a
Updated tests to test using a str init.
MicahGale Nov 22, 2024
2c5350b
Fixed case of overriding subclass var.
MicahGale Nov 22, 2024
1772873
Added number parameter to all numbered mcnp objects.
MicahGale Nov 22, 2024
e2a7079
added universal parse method.
MicahGale Nov 22, 2024
0009c78
Test number init.
MicahGale Nov 22, 2024
d3d1acc
Fixed various bugs with how default numbers are loaded.
MicahGale Nov 22, 2024
350accd
Added #88 to changelog.
MicahGale Nov 22, 2024
c8b5187
Tested parse.
MicahGale Nov 22, 2024
a2d6081
Actually appended the objects to self.
MicahGale Nov 22, 2024
c8dd2e4
Updated starting guide to use number constructor.
MicahGale Nov 22, 2024
085cc3f
test type enforcement.
MicahGale Nov 22, 2024
fb68afb
Documented how to use parse.
MicahGale Nov 22, 2024
cb17eac
Formatted with black.
MicahGale Nov 22, 2024
a194a45
Fixed typo in doctest.
MicahGale Nov 22, 2024
16955cc
Fixed common instances dictionary of singleton.
MicahGale Nov 25, 2024
a00ea39
Fixed bug with changing - to space for material number.
MicahGale Nov 25, 2024
1e939a9
Moved logic to nuclide to ensure nucleus arguments are always unique.
MicahGale Nov 25, 2024
83d8cfb
Fixed traceback hiding.
MicahGale Nov 25, 2024
6c2d84c
Fixed a few bugs.
MicahGale Nov 25, 2024
ccb30d2
Tested get_nuclide_library
MicahGale Nov 25, 2024
7adfc5d
Fixed bugs with get_nuclide_library.
MicahGale Nov 25, 2024
b5f00fd
Made library case agnostic.
MicahGale Nov 25, 2024
dbd90f1
Tested material getter setter deleter and iter.
MicahGale Nov 25, 2024
f4f2a70
Fixed various bugs with getter setter deleter.
MicahGale Nov 25, 2024
e05397f
Tested contains for materials.
MicahGale Nov 25, 2024
4861b34
updated nuclide repr.
MicahGale Nov 25, 2024
1ae42fc
Made equality more robust, and switched defaults of nuclide to match …
MicahGale Nov 25, 2024
188e6c6
Fixed and simplified material contains.
MicahGale Nov 25, 2024
6c7d5c5
Made test more robust.
MicahGale Nov 25, 2024
f35874d
Tested material values and nuclides
MicahGale Nov 26, 2024
e9de221
Fixed bugs with material nuclides and values.
MicahGale Nov 26, 2024
224b08e
tested material append
MicahGale Nov 26, 2024
5287e0b
Simplified material append.
MicahGale Nov 26, 2024
7318fdf
Added dict like iterator to default libraries
MicahGale Nov 27, 2024
2735c1b
Added default libraries to export test.
MicahGale Nov 27, 2024
b28e253
Added syntax tree deleter to delitem.
MicahGale Nov 27, 2024
a93fd11
Added tests for change lib and add nuclide.
MicahGale Nov 27, 2024
85c9c51
Added better material documentation.
MicahGale Nov 27, 2024
426a7f9
Fixed and implemented material contains.
MicahGale Nov 27, 2024
1d606ac
Tested material find and normalize.
MicahGale Nov 27, 2024
ec1c263
Fixed material contains to take fancy name elemental.
MicahGale Nov 27, 2024
5c00c23
Refactored meta_isomer to be more consistent.
MicahGale Nov 27, 2024
6135576
Fixed material find to actually work.
MicahGale Nov 27, 2024
6e9d8c5
Added docstrings.
MicahGale Nov 27, 2024
c1cf0c7
I can't count.
MicahGale Nov 27, 2024
0d63192
Made library completely sortable.
MicahGale Nov 27, 2024
5125256
Made material find work with null library.
MicahGale Nov 27, 2024
8ad097e
Added bad tests for material find.
MicahGale Nov 27, 2024
72d9b33
Simplified material filters.
MicahGale Nov 27, 2024
80282ff
removed library slicing methods that aren't needed.
MicahGale Nov 27, 2024
d07d5f1
Tested materials.
MicahGale Nov 27, 2024
7e2acf6
Fixed materials get containing.
MicahGale Nov 27, 2024
4d34ad6
Added top level import
MicahGale Nov 27, 2024
afbd1c2
Removed dead code and allowed 0 as a number.
MicahGale Nov 27, 2024
58ade28
Made exemption for mat 0.
MicahGale Nov 27, 2024
9a5cc03
Moved test_numbered completely to pytest.
MicahGale Nov 27, 2024
267a639
Tested collection set logic.
MicahGale Nov 28, 2024
4754bde
Fixed set logic implementation for collections.
MicahGale Nov 28, 2024
83a96fe
Cleaned up deprecations
MicahGale Nov 28, 2024
e641fd3
Tested materials and nuclei.
MicahGale Nov 28, 2024
3e4d235
Tested nucleus.
MicahGale Nov 29, 2024
ef7676f
Fixed < logic.
MicahGale Nov 29, 2024
e94f3dc
Tested nuclides.
MicahGale Nov 29, 2024
0bf8e75
Documented testing standards and type hints standards.
MicahGale Nov 29, 2024
345eeda
Cleaned up bugs in nuclide init.
MicahGale Nov 29, 2024
0e6de93
Fixed bugs with lt for nuclide.
MicahGale Nov 29, 2024
9b71749
Made sphinx happy with docstring code.
MicahGale Nov 29, 2024
900148f
Workaround for string formatter bug in py 3.9
MicahGale Nov 29, 2024
780ccc6
Trying for 100% diff coverage.
MicahGale Nov 29, 2024
81d906e
Fixed bug with updating blank library
MicahGale Nov 29, 2024
39975c6
Actually cleaned up after self.
MicahGale Nov 29, 2024
901fb3d
Actually required number for making a half space.
MicahGale Nov 29, 2024
2a2dd9a
Removed dead code.
MicahGale Nov 29, 2024
e56f5d1
100% diff coverage?
MicahGale Nov 29, 2024
15d686b
Avoid any __dict__ in singletons.
MicahGale Nov 29, 2024
e8f8501
Don't assume mcnp_object will have a dict.
MicahGale Nov 29, 2024
e4db053
Avoided 3.9 attributeError limits.
MicahGale Nov 29, 2024
42ec7d2
Fixed doc tests.
MicahGale Nov 29, 2024
41d8292
Found edge case with contains to test for.
MicahGale Nov 29, 2024
2ec26fd
Fixed ambiguous nuclides.
MicahGale Nov 29, 2024
b4f7f7e
Added version change and added and clarified docs.
MicahGale Nov 30, 2024
71e3cce
Updated changelog for #507.
MicahGale Nov 30, 2024
c26b64c
Wrote up examples of NumberedObjectCollection
MicahGale Nov 30, 2024
e05dca7
Updated docs and made methods more set like.
MicahGale Nov 30, 2024
6efea24
Updated tests for new set like behavior.
MicahGale Nov 30, 2024
8fe6a85
Added notes to Collections to where to find examples.
MicahGale Nov 30, 2024
657301e
Updated extend to use internal append.
MicahGale Nov 30, 2024
ac7e86c
Fixed cells clone.
MicahGale Nov 30, 2024
2c1071a
Updated test to make more sense.
MicahGale Nov 30, 2024
45a5e86
Fixed tests with problem.cells setter.
MicahGale Dec 2, 2024
ba0142d
Just ignore adding children objects.
MicahGale Dec 2, 2024
e5317cd
Handled case of stale cache in internal append.
MicahGale Dec 2, 2024
664b483
Tested cloning cells directly.
MicahGale Dec 3, 2024
6e38640
Tested setting and exporting is_atom_fraction.
MicahGale Dec 3, 2024
bdcd79d
Increased benchmark threshold for now due to feature release priority.
MicahGale Dec 3, 2024
56ec992
deepcopy to avoid sullying common fixture.
MicahGale Dec 4, 2024
7246580
Made deadline more lenient and don't say None is not None.
MicahGale Dec 4, 2024
81ac9a1
Fixed bug with surface number collisions when cloning a detached cell.
MicahGale Dec 4, 2024
e3765f9
Updated test logic for geometry.
MicahGale Dec 4, 2024
b2d426c
Updated benchmark to measure GC ratio.
MicahGale Dec 5, 2024
0dc8d7c
Added materials.mix.
MicahGale Dec 5, 2024
8a0104a
Tested materials mixing.
MicahGale Dec 5, 2024
665b8d1
ehh 50% is good enough.
MicahGale Dec 5, 2024
c522aa9
Fixed example code in numbered_object_collection.
MicahGale Dec 5, 2024
75bc17b
Removed 6.3.1 links that are broken thanks to OSTI pdfs.
MicahGale Dec 5, 2024
3b9476e
Cleared out all TODO items.
MicahGale Dec 5, 2024
2184765
Merge pull request #507 from idaholab/mat_redesign
MicahGale Dec 5, 2024
5fb2b83
Merge branch 'alpha-test-dev' into parse_method
MicahGale Dec 5, 2024
813d35f
Post-merge black formatting.
MicahGale Dec 5, 2024
eba0d1d
Fixed name errors.
MicahGale Dec 5, 2024
403fa45
Made lazy pretty print, and abandoned parens.
MicahGale Dec 6, 2024
a1897ba
Made sure mat number is never padded.
MicahGale Dec 6, 2024
624cbd8
Switched positional to keyword arg.
MicahGale Dec 6, 2024
2cf7f2a
Tested pretty str.
MicahGale Dec 6, 2024
eca2d48
Handled more pretty str edge cases.
MicahGale Dec 6, 2024
cd8281f
Added slots behavior to changelog.
MicahGale Dec 9, 2024
ce787d0
Merge branch 'develop' into alpha-test-dev
MicahGale Dec 9, 2024
c54e5bb
Merge branch 'alpha-test-dev' into parse_method
MicahGale Dec 12, 2024
2d92f36
Updated changelog to point to issue and not PR.
MicahGale Dec 14, 2024
7dcbbd7
Removed errant doc string.
MicahGale Dec 14, 2024
5f83b97
Updated all object init to use a type alias hint.
MicahGale Dec 14, 2024
e855ca2
Updated typeerror with more guidance.
MicahGale Dec 14, 2024
09cf9f9
Py39 can't check isisntance of a Union type.
MicahGale Dec 15, 2024
39bdd02
Merge branch 'develop' into parse_method
MicahGale Dec 15, 2024
736851a
Fixed typo with pyproject from merge.
MicahGale Dec 15, 2024
b2b009b
Merge branch 'develop' into alpha-test-dev
MicahGale Dec 16, 2024
74f9af9
Merge branch 'alpha-test-dev' into parse_method
MicahGale Dec 16, 2024
f3b1591
Merge branch 'develop' into alpha-test-dev
MicahGale Dec 16, 2024
0c21e86
Merge branch 'alpha-test-dev' into parse_method
MicahGale Dec 16, 2024
a51985b
Merge branch 'develop' into alpha-test-dev
MicahGale Jan 6, 2025
52ae985
Merge branch 'alpha-test-dev' into parse_method
MicahGale Jan 6, 2025
dbea433
Merge branch 'develop' into alpha-test-dev
MicahGale Jan 6, 2025
f418865
Merge branch 'alpha-test-dev' into parse_method
MicahGale Jan 9, 2025
9556f84
Fixed circular import.
MicahGale Jan 11, 2025
7f18ee7
Added append option to MCNP_Problem.parse.
MicahGale Jan 11, 2025
ffcb68d
Tested parse append.
MicahGale Jan 11, 2025
6b9baf7
Promoted parsing functions to be top level functions.
MicahGale Jan 11, 2025
565d19c
Made parse_surface function name more pythonic.
MicahGale Jan 11, 2025
e76db62
hid pretty_str as it's not ready yet.
MicahGale Jan 11, 2025
2663481
Added demo of parse functions.
MicahGale Jan 11, 2025
843780d
Added demo of append option.
MicahGale Jan 11, 2025
8b184de
Updated tests for pretty_str change.
MicahGale Jan 11, 2025
c8abb71
Updated references to deprecated surface_builder.
MicahGale Jan 11, 2025
4838a86
Removed all version change markers for 0.2.0
MicahGale Jan 11, 2025
57aaac5
Merge pull request #595 from idaholab/parse_method
MicahGale Jan 13, 2025
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
Prev Previous commit
Next Next commit
hid pretty_str as it's not ready yet.
  • Loading branch information
MicahGale committed Jan 11, 2025
commit e76db62524a894a866a081472357c3367cfbe940
16 changes: 8 additions & 8 deletions montepy/input_parser/syntax_node.py
Original file line number Diff line number Diff line change
@@ -196,7 +196,7 @@ def flatten(self):
ret += node.flatten()
return ret

def pretty_str(self):
def _pretty_str(self):
INDENT = 2
if not self.nodes:
return f"<Node: {self.name}: []>"
@@ -324,7 +324,7 @@ def flatten(self):
ret += node.flatten()
return ret

def pretty_str(self):
def _pretty_str(self):
INDENT = 2
ret = f"<Node: {self.name}: {{\n"
for key, val in self.nodes.items():
@@ -390,7 +390,7 @@ def __str__(self):
f"{f'Short:{self._right_short_type.value}' if self._right_short_type else ''}>"
)

def pretty_str(self):
def _pretty_str(self):
INDENT = 2
ret = f"<Geometry: {self.name}: [\n"
for key, val in [
@@ -889,7 +889,7 @@ def comments(self):
def __str__(self):
return self.format()

def pretty_str(self):
def _pretty_str(self):
return str(self)

def __repr__(self):
@@ -1347,7 +1347,7 @@ def token(self):
def __str__(self):
return f"<Value, {self._value}, padding: {self._padding}>"

def pretty_str(self):
def _pretty_str(self):
return str(self)

def __repr__(self):
@@ -1859,7 +1859,7 @@ def format(self):
def __repr__(self):
return f"(Materials: {self.nodes})"

def pretty_str(self):
def _pretty_str(self):
INDENT = 2
ret = f"<Node: {self.name}: [\n"
for val in self.nodes:
@@ -2485,7 +2485,7 @@ def __repr__(self):
f" padding: {self.padding})"
)

def pretty_str(self):
def _pretty_str(self):
return f"""<Classifier: {{
mod: {self.modifier},
prefix: {self.prefix},
@@ -2588,7 +2588,7 @@ def __str__(self):
def __repr__(self):
return str(self)

def pretty_str(self):
def _pretty_str(self):
INDENT = 2
ret = f"<Node: {self.name}: {{\n"
print(self.nodes)