Updated iterative_fitter.py

2025-12-06 01:48:53 -06:00 · 2020-07-15 20:25:27 -06:00
parent 1ad6d8e925
commit 12723eed6b
5 changed files with 217 additions and 191 deletions
--- a/.idea/dictionaries/Titus.xml
+++ b/.idea/dictionaries/Titus.xml
@@ -18,6 +18,7 @@
      <w>maxiter</w>
      <w>molality</w>
      <w>ndarray</w>
+      <w>pitzer</w>
      <w>pred</w>
      <w>quah</w>
      <w>rbfopt</w>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,10 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="f4439dc0-6756-4612-8f7d-596d8949f300" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/dictionaries/Titus.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dictionaries/Titus.xml" 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$/data/xmls/twophase.xml" beforeDir="false" afterPath="$PROJECT_DIR$/data/xmls/twophase.xml" 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" />
-      <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$/docs/Examples/iterative_fitter.py" beforeDir="false" afterPath="$PROJECT_DIR$/docs/Examples/iterative_fitter.py" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/llepe/llepe.py" beforeDir="false" afterPath="$PROJECT_DIR$/llepe/llepe.py" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
@@ -350,7 +349,14 @@
      <option name="project" value="LOCAL" />
      <updated>1594785960460</updated>
    </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="Added new feature to include custom_object_dicts where user can optimize parameters in the dependent_params_dict.">
+      <created>1594852623912</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1594852623912</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
    <servers />
  </component>
  <component name="Vcs.Log.Tabs.Properties">
@@ -384,7 +390,8 @@
    <MESSAGE value="add outputs folder to examples" />
    <MESSAGE value="updated iterative_fitter_monitor.py" />
    <MESSAGE value="updated iterative_fitter.py to have more feedback" />
-    <option name="LAST_COMMIT_MESSAGE" value="updated iterative_fitter.py to have more feedback" />
+    <MESSAGE value="Added new feature to include custom_object_dicts where user can optimize parameters in the dependent_params_dict." />
+    <option name="LAST_COMMIT_MESSAGE" value="Added new feature to include custom_object_dicts where user can optimize parameters in the dependent_params_dict." />
  </component>
  <component name="WindowStateProjectService">
    <state x="-1330" y="212" key="#Inspections" timestamp="1590787654691">
@@ -426,46 +433,46 @@
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
    <state x="-1523" y="423" key="GitRewordDialog/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1592321433648" />
-    <state width="1899" height="348" key="GridCell.Tab.0.bottom" timestamp="1594852467309">
+    <state width="1899" height="348" key="GridCell.Tab.0.bottom" timestamp="1594852783300">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.0.bottom/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467309" />
+    <state width="1899" height="348" key="GridCell.Tab.0.bottom/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783300" />
    <state width="1897" height="281" key="GridCell.Tab.0.bottom/0.0.1536.824/-1920.2.1920.1040@0.0.1536.824" timestamp="1590795386435" />
    <state width="1899" height="279" key="GridCell.Tab.0.bottom/0.0.1920.1040@0.0.1920.1040" timestamp="1594769549587" />
-    <state width="1899" height="348" key="GridCell.Tab.0.center" timestamp="1594852467309">
+    <state width="1899" height="348" key="GridCell.Tab.0.center" timestamp="1594852783299">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.0.center/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467309" />
+    <state width="1899" height="348" key="GridCell.Tab.0.center/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783299" />
    <state width="1897" height="281" key="GridCell.Tab.0.center/0.0.1536.824/-1920.2.1920.1040@0.0.1536.824" timestamp="1590795386434" />
    <state width="1899" height="279" key="GridCell.Tab.0.center/0.0.1920.1040@0.0.1920.1040" timestamp="1594769549587" />
-    <state width="1899" height="348" key="GridCell.Tab.0.left" timestamp="1594852467309">
+    <state width="1899" height="348" key="GridCell.Tab.0.left" timestamp="1594852783299">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.0.left/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467309" />
+    <state width="1899" height="348" key="GridCell.Tab.0.left/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783299" />
    <state width="1897" height="281" key="GridCell.Tab.0.left/0.0.1536.824/-1920.2.1920.1040@0.0.1536.824" timestamp="1590795386433" />
    <state width="1899" height="279" key="GridCell.Tab.0.left/0.0.1920.1040@0.0.1920.1040" timestamp="1594769549587" />
-    <state width="1899" height="348" key="GridCell.Tab.0.right" timestamp="1594852467309">
+    <state width="1899" height="348" key="GridCell.Tab.0.right" timestamp="1594852783300">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.0.right/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467309" />
+    <state width="1899" height="348" key="GridCell.Tab.0.right/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783300" />
    <state width="1897" height="281" key="GridCell.Tab.0.right/0.0.1536.824/-1920.2.1920.1040@0.0.1536.824" timestamp="1590795386434" />
    <state width="1899" height="279" key="GridCell.Tab.0.right/0.0.1920.1040@0.0.1920.1040" timestamp="1594769549587" />
-    <state width="1899" height="348" key="GridCell.Tab.1.bottom" timestamp="1594852467310">
+    <state width="1899" height="348" key="GridCell.Tab.1.bottom" timestamp="1594852783301">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.1.bottom/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467310" />
-    <state width="1899" height="348" key="GridCell.Tab.1.center" timestamp="1594852467310">
+    <state width="1899" height="348" key="GridCell.Tab.1.bottom/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783301" />
+    <state width="1899" height="348" key="GridCell.Tab.1.center" timestamp="1594852783301">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.1.center/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467310" />
-    <state width="1899" height="348" key="GridCell.Tab.1.left" timestamp="1594852467309">
+    <state width="1899" height="348" key="GridCell.Tab.1.center/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783301" />
+    <state width="1899" height="348" key="GridCell.Tab.1.left" timestamp="1594852783300">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.1.left/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467309" />
-    <state width="1899" height="348" key="GridCell.Tab.1.right" timestamp="1594852467310">
+    <state width="1899" height="348" key="GridCell.Tab.1.left/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783300" />
+    <state width="1899" height="348" key="GridCell.Tab.1.right" timestamp="1594852783301">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
-    <state width="1899" height="348" key="GridCell.Tab.1.right/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852467310" />
+    <state width="1899" height="348" key="GridCell.Tab.1.right/0.0.1536.824/-1920.2.1920.1040@-1920.2.1920.1040" timestamp="1594852783301" />
    <state x="-1460" y="164" key="SettingsEditor" timestamp="1591824476757">
      <screen x="-1920" y="2" width="1920" height="1040" />
    </state>
@@ -517,11 +524,6 @@
          <line>9</line>
          <option name="timeStamp" value="1" />
        </line-breakpoint>
-        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
-          <url>file://$PROJECT_DIR$/docs/examples/iterative_fitter.py</url>
-          <line>26</line>
-          <option name="timeStamp" value="5" />
-        </line-breakpoint>
      </breakpoints>
      <default-breakpoints>
        <breakpoint type="python-exception">