update

seto77 · Jul 2, 2021 · e4456f8 · e4456f8
1 parent 121024c
commit e4456f8
Show file tree

Hide file tree

Showing 11 changed files with 1,279 additions and 1,128 deletions.
diff --git a/Crystallography.Controls/Crystallography.Controls.csproj b/Crystallography.Controls/Crystallography.Controls.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2021.7.2.0724</AssemblyVersion>
-    <FileVersion>2021.7.2.0724</FileVersion>
+    <AssemblyVersion>2021.7.2.0756</AssemblyVersion>
+    <FileVersion>2021.7.2.0756</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Crystallography/Crystallography.csproj b/Crystallography/Crystallography.csproj
@@ -4,8 +4,8 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net5.0-windows</TargetFramework>
     <UseWindowsForms>true</UseWindowsForms>
-    <AssemblyVersion>2021.7.2.0724</AssemblyVersion>
-    <FileVersion>2021.7.2.0724</FileVersion>
+    <AssemblyVersion>2021.7.2.0756</AssemblyVersion>
+    <FileVersion>2021.7.2.0756</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/Crystallography/EOS.cs b/Crystallography/EOS.cs
diff --git a/PDIndexer/DataConverter/FormDataConverter.cs b/PDIndexer/DataConverter/FormDataConverter.cs
@@ -109,8 +109,8 @@ public int EDXDetectorNumber
                         flowLayoutPanelEDX.SuspendLayout();
                         while(value!=EDXControls.Count)
                         {
-                            EDXControls.Add(new EDXControl() { DetectorName="#"+ EDXControls.Count.ToString()});
-                            flowLayoutPanelEDX.Controls.Add(EDXControls[EDXControls.Count - 1]);
+                            EDXControls.Add(new EDXControl() { DetectorName= $"#{EDXControls.Count}" });
+                            flowLayoutPanelEDX.Controls.Add(EDXControls[^1]);
                         }
                         flowLayoutPanelEDX.ResumeLayout();
                     }

diff --git a/PDIndexer/FormAtomicPositionFinder.cs b/PDIndexer/FormAtomicPositionFinder.cs
@@ -357,10 +357,10 @@ private void textBoxFormula_TextChanged(object sender, EventArgs e)
                 if (numericTexBox[i].Value > 0)
                 {
                     ionicRadius.Add(new UserControlIonicRadius());
-                    ionicRadius[ionicRadius.Count - 1].Element = label[i].Text;
-                    ionicRadius[ionicRadius.Count - 1].AtomicNumber = i;
+                    ionicRadius[^1].Element = label[i].Text;
+                    ionicRadius[^1].AtomicNumber = i;
 
-                    ionicRadius[ionicRadius.Count - 1].Radius = getIonRadius(i);
+                    ionicRadius[^1].Radius = getIonRadius(i);
                 }
             //既に配置済みのものがあれば回収する
             for (int i = 0; i < flowLayoutPanelIonicRadius.Controls.Count; i++)
@@ -724,7 +724,7 @@ private FindCondition getFindingCondition()
             for (int i = 0; i < crystal.Count; i++)
                 //if (radioButtonAngleThreshold.Checked)
                 {
-                    crystal[i].SetPlanes(double.MaxValue, peaks[peaks.Count - 1].X * 0.8, true, true, false, true,HorizontalAxis.Angle,
+                    crystal[i].SetPlanes(double.MaxValue, peaks[^1].X * 0.8, true, true, false, true,HorizontalAxis.Angle,
                         (double)numericUpDownAngleThreshold.Value / 180.0 * Math.PI, waveLengthControl1.WaveLength);
                 }
                 //else if (radioButtonAngleThreshold.Checked)

diff --git a/PDIndexer/FormCellFinder.cs b/PDIndexer/FormCellFinder.cs
@@ -405,9 +405,9 @@ private Candidate GetResidualValue(Candidate c, FindCondition condition, int see
             double CellVolumeSqure = a2 * b2 * c2 * (1 - CosAlpha * CosAlpha - CosBeta * CosBeta - CosGamma * CosGamma + 2 * CosAlpha * CosBeta * CosGamma);
 
             //検索する指数範囲を設定
-            int hMax = Math.Min((int)(c.A / (condition.SortedD[condition.SortedD.Length - 1].D * 0.9)), 30);
-            int kMax = Math.Min((int)(c.B / (condition.SortedD[condition.SortedD.Length - 1].D * 0.9)), 30);
-            int lMax = Math.Min((int)(c.C / (condition.SortedD[condition.SortedD.Length - 1].D * 0.9)), 30);
+            int hMax = Math.Min((int)(c.A / (condition.SortedD[^1].D * 0.9)), 30);
+            int kMax = Math.Min((int)(c.B / (condition.SortedD[^1].D * 0.9)), 30);
+            int lMax = Math.Min((int)(c.C / (condition.SortedD[^1].D * 0.9)), 30);
 
             Plane[] obs = new Plane[condition.SortedD.Length];
             for (int i = 0; i < obs.Length; i++)

diff --git a/PDIndexer/FormEOS.Designer.cs b/PDIndexer/FormEOS.Designer.cs
diff --git a/PDIndexer/FormEOS.cs b/PDIndexer/FormEOS.cs
@@ -75,6 +75,8 @@ private void Gold()
             numericalTextBoxGoldTsuchiya.Value = EOS.Au_Tsuchiya(a / 10, a0 / 10, t);
             //Yokoo
             numericBoxAuYokoo.Value = EOS.AuYokoo(v0, v, t);
+            //Fratanduono
+            numericBoxAuFratanduono.Value = EOS.Au_Fratanduono_Vinet(v0, v);
         }
 
         private void Ar()
@@ -137,9 +139,10 @@ private void NaClB1()
 
         private void Pt()
         {
-
             double a = numericalTextBoxPtA.Value;
+            var v = a * a * a;
             double a0 = numericalTextBoxPtA0.Value;
+            var v0 = a0 * a0 * a0;
             double t0 = numericalTextBoxPtT0.Value;
             double t = numericalTextBoxTemperature.Value;
 
@@ -150,11 +153,13 @@ private void Pt()
             //Matsui
             numericalTextBoxPtMatsui.Value = EOS.Pt_Matsui(t, t0, a / 10, a0 / 10);
             //Yokoo
-            numericBoxPtYokoo.Value = EOS.PtYokoo(a0 * a0 * a0, a * a * a, t);
+            numericBoxPtYokoo.Value = EOS.PtYokoo(v0, v, t);
+            //Fratanduono
+            numericBoxPtFratanduono.Value = EOS.Pt_Fratanduono_Vinet(v0, v);
         }
 
 
-	
+
         private void Corundum()
         {
             double v = numericalTextBoxColundumV.Value;