Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Updates submodule #78

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
Sep 11, 2024
Merged

Updates submodule #78

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: 3 additions & 3 deletions RATapi/inputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,8 +360,8 @@ def make_cells(project: RATapi.Project) -> Cells:
cells.f2 = all_data
cells.f3 = data_limits
cells.f4 = simulation_limits
cells.f5 = [contrast_model if contrast_model else [0] for contrast_model in contrast_models]
cells.f6 = layer_details if project.model == LayerModels.StandardLayers else [[0]]
cells.f5 = [contrast_model if contrast_model else [] for contrast_model in contrast_models]
cells.f6 = layer_details if project.model == LayerModels.StandardLayers else []
cells.f7 = [param.name for param in project.parameters]
cells.f8 = [param.name for param in project.background_parameters]
cells.f9 = [param.name for param in project.scalefactors]
Expand All @@ -381,7 +381,7 @@ def make_cells(project: RATapi.Project) -> Cells:
for domain_contrast in project.domain_contrasts
]
cells.f19 = [
domain_contrast_model if domain_contrast_model else 0 for domain_contrast_model in domain_contrast_models
domain_contrast_model if domain_contrast_model else [] for domain_contrast_model in domain_contrast_models
]

cells.f20 = [param.name for param in project.domain_ratios]
Expand Down
2 changes: 1 addition & 1 deletion cpp/RAT
Open in desktop
Submodule RAT updated 31 files
+6 −6 RATMain.cpp
+0 −2 RATMain_initialize.cpp
+1 −1 RATMain_internal_types.h
+0 −41 RATMain_rtwutil.cpp
+0 −3 RATMain_rtwutil.h
+0 −2 RATMain_terminate.cpp
+1 −18 RATMain_types.h
+53 −52 SLDFunction.cpp
+12 −27 allocateLayersForContrast.cpp
+2 −2 allocateLayersForContrast.h
+21 −21 allocateParamsToLayers.cpp
+1 −1 allocateParamsToLayers.h
+61 −1 blockedSummation.cpp
+4 −4 boundaryHandling.cpp
+1 −1 calcProposal.cpp
+87 −16 find.cpp
+8 −4 find.h
+1 −1 kmeans.cpp
+21 −0 mrdivide_helper.cpp
+2 −0 mrdivide_helper.h
+11 −8 nest2pos.cpp
+0 −32 nullAssignment.cpp
+0 −1 nullAssignment.h
+1 −1 processBayes.cpp
+30 −28 ratDREAM.cpp
+1 −1 removeOutlier.cpp
+1 −1 runDE.cpp
+2 −2 runDREAM.cpp
+1 −1 runNestedSampler.cpp
+81 −97 standardLayers.cpp
+24 −39 standardLayers1.cpp
4 changes: 2 additions & 2 deletions tests/test_inputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ def custom_xy_cells():
cells.f2 = [np.empty([0, 3])]
cells.f3 = [[0.0, 0.0]]
cells.f4 = [[0.005, 0.7]]
cells.f5 = [[0]]
cells.f6 = [[0]]
cells.f5 = [[]]
cells.f6 = []
cells.f7 = ["Substrate Roughness", "Test Thickness", "Test SLD", "Test Roughness"]
cells.f8 = ["Background Param 1"]
cells.f9 = ["Scalefactor 1"]
Expand Down
Loading