updated iterative_fitter.py to have more feedback

pull/1/head
titusquah 5 years ago
parent f933a8bd81
commit 9c61bb90ab

@ -3,8 +3,6 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f4439dc0-6756-4612-8f7d-596d8949f300" name="Default Changelist" comment=""> <list default="true" id="f4439dc0-6756-4612-8f7d-596d8949f300" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/Examples/iterative_fitter.py" beforeDir="false" afterPath="$PROJECT_DIR$/docs/Examples/iterative_fitter.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/docs/examples/iterative_fitter_monitor.py" beforeDir="false" afterPath="$PROJECT_DIR$/docs/examples/iterative_fitter_monitor.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -330,7 +328,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1594772074449</updated> <updated>1594772074449</updated>
</task> </task>
<option name="localTasksCounter" value="24" /> <task id="LOCAL-00024" summary="updated iterative_fitter_monitor.py">
<created>1594785526950</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1594785526950</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -362,7 +367,8 @@
<MESSAGE value="flipped backslashes for package files" /> <MESSAGE value="flipped backslashes for package files" />
<MESSAGE value="changed temp file to outputs/temp.xml" /> <MESSAGE value="changed temp file to outputs/temp.xml" />
<MESSAGE value="add outputs folder to examples" /> <MESSAGE value="add outputs folder to examples" />
<option name="LAST_COMMIT_MESSAGE" value="add outputs folder to examples" /> <MESSAGE value="updated iterative_fitter_monitor.py" />
<option name="LAST_COMMIT_MESSAGE" value="updated iterative_fitter_monitor.py" />
</component> </component>
<component name="WindowStateProjectService"> <component name="WindowStateProjectService">
<state x="-1330" y="212" key="#Inspections" timestamp="1590787654691"> <state x="-1330" y="212" key="#Inspections" timestamp="1590787654691">
@ -386,10 +392,10 @@
<screen x="-1920" y="2" width="1920" height="1040" /> <screen x="-1920" y="2" width="1920" height="1040" />
</state> </state>
<state x="-1213" y="379" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1590787657711" /> <state x="-1213" y="379" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1590787657711" />
<state x="-1364" y="117" key="CommitChangelistDialog2" timestamp="1594785435182"> <state x="-1364" y="117" key="CommitChangelistDialog2" timestamp="1594785887392">
<screen x="-1920" y="2" width="1920" height="1040" /> <screen x="-1920" y="2" width="1920" height="1040" />
</state> </state>
<state x="-1364" y="117" key="CommitChangelistDialog2/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594785435182" /> <state x="-1364" y="117" key="CommitChangelistDialog2/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594785887392" />
<state x="836" y="163" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594772072782" /> <state x="836" y="163" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594772072782" />
<state x="-1828" y="94" width="1736" height="856" key="DiffContextDialog" timestamp="1591048879404"> <state x="-1828" y="94" width="1736" height="856" key="DiffContextDialog" timestamp="1591048879404">
<screen x="-1920" y="2" width="1920" height="1040" /> <screen x="-1920" y="2" width="1920" height="1040" />

@ -45,6 +45,7 @@ i = 0
rel_diff = 1000 rel_diff = 1000
while rel_diff > 1e-4: while rel_diff > 1e-4:
i += 1 i += 1
print(i)
best_obj = 1e20 best_obj = 1e20
output_dict['iter'].append(i) output_dict['iter'].append(i)
for species in species_list: for species in species_list:
@ -57,7 +58,8 @@ while rel_diff > 1e-4:
'Cphi': [], 'Cphi': [],
'obj_value': [], 'obj_value': [],
'guess': []} 'guess': []}
for x_guess in x_guesses: for ind1, x_guess in enumerate(x_guesses):
print(ind1)
info_dict = {'(HA)2(org)_h0': {'upper_element_name': 'species', info_dict = {'(HA)2(org)_h0': {'upper_element_name': 'species',
'upper_attrib_name': 'name', 'upper_attrib_name': 'name',
'upper_attrib_value': '(HA)2(org)', 'upper_attrib_value': '(HA)2(org)',

Loading…
Cancel
Save