ANL-CEEESA
/
LLEPE
mirror of https://github.com/ANL-CEEESA/LLEPE
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated iterative_fitter.py to calculate error for all species. Added new test with mean squared error.

Browse Source
pull/1/head
titusquah 5 years ago
parent 6a4aad4266
commit 3571698900
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File

27
.idea/workspace.xml
Unescape View File

@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f4439dc0-6756-4612-8f7d-596d8949f300" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/docs/Examples/iterative_fitter_eval_grapher.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/Examples/iterative_fitter_w_mse.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/xmls/PC88A_HCL_NdPrCeLaDySmY_w_pitzer.xml" beforeDir="false" afterPath="$PROJECT_DIR$/data/xmls/PC88A_HCL_NdPrCeLaDySmY_w_pitzer.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/outputs/temp.xml" beforeDir="false" afterPath="$PROJECT_DIR$/docs/Examples/outputs/temp.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/llepe/objectives.py" beforeDir="false" afterPath="$PROJECT_DIR$/llepe/objectives.py" afterDir="false" />
<list default="true" id="f4439dc0-6756-4612-8f7d-596d8949f300" name="Default Changelist" comment="Updated iterative_fitter.py to calculate error for all species. Added new test with mean squared error.">
<change afterPath="$PROJECT_DIR$/docs/Examples/outputs/iterative_fitter_output2.csv" afterDir="false" />
<change afterPath="$PROJECT_DIR$/docs/Examples/outputs/iterative_fitter_short_info_dict.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -414,7 +409,14 @@
<option name="project" value="LOCAL" />
<updated>1594962327468</updated>
</task>
<option name="localTasksCounter" value="35" />
<task id="LOCAL-00035" summary="Updated iterative_fitter.py to calculate error for all species. Added new test with mean squared error.">
<created>1595008865648</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1595008865648</updated>
</task>
<option name="localTasksCounter" value="36" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -451,7 +453,8 @@
<MESSAGE value="Added new feature to include custom_object_dicts where user can optimize parameters in the dependent_params_dict." />
<MESSAGE value="Updated iterative_fitter.py" />
<MESSAGE value="Updated iterative_fitter.py to fix slopes to 3, stop after minimal change in best objective. ALso added last results from iteration_fitter.py" />
<option name="LAST_COMMIT_MESSAGE" value="Updated iterative_fitter.py to fix slopes to 3, stop after minimal change in best objective. ALso added last results from iteration_fitter.py" />
<MESSAGE value="Updated iterative_fitter.py to calculate error for all species. Added new test with mean squared error." />
<option name="LAST_COMMIT_MESSAGE" value="Updated iterative_fitter.py to calculate error for all species. Added new test with mean squared error." />
</component>
<component name="WindowStateProjectService">
<state x="-1330" y="212" key="#Inspections" timestamp="1590787654691">
@ -475,10 +478,10 @@
<screen x="-1920" y="2" width="1920" height="1040" />
</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="-1364" y="117" key="CommitChangelistDialog2" timestamp="1595008855209">
<state x="-1364" y="117" key="CommitChangelistDialog2" timestamp="1595009120606">
<screen x="-1920" y="2" width="1920" height="1040" />
</state>
<state x="-1364" y="117" key="CommitChangelistDialog2/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1595008855209" />
<state x="-1364" y="117" key="CommitChangelistDialog2/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1595009120606" />
<state x="662" y="155" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1594913509145" />
<state x="-1828" y="94" width="1736" height="856" key="DiffContextDialog" timestamp="1591048879404">
<screen x="-1920" y="2" width="1920" height="1040" />

8
docs/Examples/outputs/iterative_fitter_output2.csv
Unescape View File

@ -0,0 +1,8 @@
,iter,best_obj,rel_diff,best_ext_h0,Nd_intercept,Nd_beta0,Nd_beta1,Pr_intercept,Pr_beta0,Pr_beta1,Ce_intercept,Ce_beta0,Ce_beta1,La_intercept,La_beta0,La_beta1,Dy_intercept,Dy_beta0,Dy_beta1,Sm_intercept,Sm_beta0,Sm_beta1,Y_intercept,Y_beta0,Y_beta1
0,0,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20,1e+20
1,1,0.00016129407933554554,21.000000000000057,-1376877.152986458,-796238.0142870437,1.437426638616483,5.347609621840506,-807393.2082028955,0.05879108393945309,0.5448323469435737,-793502.5397317475,1.584075553189004,9.71291104987633,-804144.2085745687,0.9975450638457432,0.5276999248444548,-801913.2126520091,0.7646409184903517,7.849312986255907,-795363.8004519838,0.5978071372268503,5.279164697561237,-814653.355406187,0.9657649833215246,8.515799878446009
2,2,0.00010559366199558426,2.7344663371161086,-1376882.3191580868,-796384.0556926059,1.437428165636144,5.347617052258618,-808095.4393259468,0.05879108550298423,0.5448323732068848,-789522.5091359932,0.20352352259320314,21.12029634455721,-803938.2604268632,1.0223150014212676,0.5296310756363933,-801912.5225008891,0.7646405127343534,7.849315503928965,-794049.2354743823,0.6989186480410126,6.87781841947533,-814193.8647533458,0.8852782052211031,9.334631175295913
3,3,0.00010559208431248382,0.871670386095456,-1376882.3191106108,-795019.7041121587,1.0623904260280357,8.59415748006841,-808447.2602100212,0.05879108748614492,0.5448324180244323,-790036.1207336787,0.20352355232601096,21.120499613123066,-803280.4365906577,1.0223156310422086,0.5296310565325039,-801913.2141124238,0.7646397332938777,7.849320590516409,-794050.473416772,0.6989082446227728,6.877882156513195,-814192.7894051562,0.8852798138822874,9.334648695392262
4,4,0.00010559049315627479,0.07015128064420798,-1376882.3191117246,-794658.0175977976,1.1251830517616783,8.514892100389922,-807677.5423918352,0.05879108748614492,0.5448324180244323,-789888.8933961166,0.20352350532323682,21.120426174002823,-803102.8847466783,1.022316535866388,0.5296311209773129,-801913.2141124238,0.7646397332938777,7.849320590516409,-794049.2325867265,0.698908158523472,6.877882600430561,-814193.8242471424,0.8852802073165494,9.334653075341238
5,5,0.00010559143289274391,0.1697956144703469,-1376882.3191117246,-794987.0313159251,1.2137224368583803,7.748229523847203,-807547.2398569525,0.05879108748614492,0.5448324180244323,-789724.873364379,0.20352350532323682,21.120426174002823,-802873.2925607098,1.022316535866388,0.5296311209773129,-801913.2141124238,0.7646397332938777,7.849320590516409,-794049.2325867265,0.698908158523472,6.877882600430561,-814193.8242471424,0.8852802073165494,9.334653075341238
6,6,0.00010559143289274391,0.0002104590846558891,-1376882.3191117246,-794919.3525195834,1.2137222016802447,7.748226963005033,-807602.8883771595,0.05879108748614492,0.5448324180244323,-789740.8658638338,0.20352350532323682,21.120426174002823,-802901.9082448303,1.022316535866388,0.5296311209773129,-801913.2141124238,0.7646397332938777,7.849320590516409,-794049.2325867265,0.698908158523472,6.877882600430561,-814193.8242471424,0.8852802073165494,9.334653075341238
1 iter best_obj rel_diff best_ext_h0 Nd_intercept Nd_beta0 Nd_beta1 Pr_intercept Pr_beta0 Pr_beta1 Ce_intercept Ce_beta0 Ce_beta1 La_intercept La_beta0 La_beta1 Dy_intercept Dy_beta0 Dy_beta1 Sm_intercept Sm_beta0 Sm_beta1 Y_intercept Y_beta0 Y_beta1
2 0 0 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20 1e+20
3 1 1 0.00016129407933554554 21.000000000000057 -1376877.152986458 -796238.0142870437 1.437426638616483 5.347609621840506 -807393.2082028955 0.05879108393945309 0.5448323469435737 -793502.5397317475 1.584075553189004 9.71291104987633 -804144.2085745687 0.9975450638457432 0.5276999248444548 -801913.2126520091 0.7646409184903517 7.849312986255907 -795363.8004519838 0.5978071372268503 5.279164697561237 -814653.355406187 0.9657649833215246 8.515799878446009
4 2 2 0.00010559366199558426 2.7344663371161086 -1376882.3191580868 -796384.0556926059 1.437428165636144 5.347617052258618 -808095.4393259468 0.05879108550298423 0.5448323732068848 -789522.5091359932 0.20352352259320314 21.12029634455721 -803938.2604268632 1.0223150014212676 0.5296310756363933 -801912.5225008891 0.7646405127343534 7.849315503928965 -794049.2354743823 0.6989186480410126 6.87781841947533 -814193.8647533458 0.8852782052211031 9.334631175295913
5 3 3 0.00010559208431248382 0.871670386095456 -1376882.3191106108 -795019.7041121587 1.0623904260280357 8.59415748006841 -808447.2602100212 0.05879108748614492 0.5448324180244323 -790036.1207336787 0.20352355232601096 21.120499613123066 -803280.4365906577 1.0223156310422086 0.5296310565325039 -801913.2141124238 0.7646397332938777 7.849320590516409 -794050.473416772 0.6989082446227728 6.877882156513195 -814192.7894051562 0.8852798138822874 9.334648695392262
6 4 4 0.00010559049315627479 0.07015128064420798 -1376882.3191117246 -794658.0175977976 1.1251830517616783 8.514892100389922 -807677.5423918352 0.05879108748614492 0.5448324180244323 -789888.8933961166 0.20352350532323682 21.120426174002823 -803102.8847466783 1.022316535866388 0.5296311209773129 -801913.2141124238 0.7646397332938777 7.849320590516409 -794049.2325867265 0.698908158523472 6.877882600430561 -814193.8242471424 0.8852802073165494 9.334653075341238
7 5 5 0.00010559143289274391 0.1697956144703469 -1376882.3191117246 -794987.0313159251 1.2137224368583803 7.748229523847203 -807547.2398569525 0.05879108748614492 0.5448324180244323 -789724.873364379 0.20352350532323682 21.120426174002823 -802873.2925607098 1.022316535866388 0.5296311209773129 -801913.2141124238 0.7646397332938777 7.849320590516409 -794049.2325867265 0.698908158523472 6.877882600430561 -814193.8242471424 0.8852802073165494 9.334653075341238
8 6 6 0.00010559143289274391 0.0002104590846558891 -1376882.3191117246 -794919.3525195834 1.2137222016802447 7.748226963005033 -807602.8883771595 0.05879108748614492 0.5448324180244323 -789740.8658638338 0.20352350532323682 21.120426174002823 -802901.9082448303 1.022316535866388 0.5296311209773129 -801913.2141124238 0.7646397332938777 7.849320590516409 -794049.2325867265 0.698908158523472 6.877882600430561 -814193.8242471424 0.8852802073165494 9.334653075341238

1
docs/Examples/outputs/iterative_fitter_short_info_dict.txt
Unescape View File

@ -0,0 +1 @@
{"(HA)2(org)_h0": -1376882.3191117246, "Nd_slope": 3, "Nd_intercept": -794919.3525195834, "Pr_slope": 3, "Pr_intercept": -807602.8883771595, "Ce_slope": 3, "Ce_intercept": -789740.8658638337, "La_slope": 3, "La_intercept": -802901.9082448303, "Dy_slope": 3, "Dy_intercept": -801913.2141124237, "Sm_slope": 3, "Sm_intercept": -794049.2325867265, "Y_slope": 3, "Y_intercept": -814193.8242471423, "Ce_beta0": 0.2035235053232368, "Ce_beta1": 21.120426174002823, "Ce_Cphi": -0.02618999999473301, "Dy_beta0": 0.7646397332938777, "Dy_beta1": 7.849320590516409, "Dy_Cphi": -0.019699989216349984, "La_beta0": 1.022316535866388, "La_beta1": 0.5296311209773129, "La_Cphi": -0.024339999997603376, "Nd_beta0": 1.2137222016802447, "Nd_beta1": 7.748226963005033, "Nd_Cphi": -0.01963615126026457, "Pr_beta0": 0.05879108748614492, "Pr_beta1": 0.5448324180244323, "Pr_Cphi": -0.02066999867229882, "Sm_beta0": 0.6989081585234721, "Sm_beta1": 6.877882600430561, "Sm_Cphi": -0.019920000110321332, "Y_beta0": 0.8852802073165494, "Y_beta1": 9.334653075341238, "Y_Cphi": -0.015467323909969704}
Write Preview
Loading…
Cancel
Save