Rename EquationOfStateForm to EquationForm in src/

src/FindVolume.jl

@@ -26,13 +26,13 @@ using Roots: find_zero,
              Newton,
              ConvergenceFailed
 
-import ..EquationOfStateForm
+import ..EquationForm
 using ..Collections: EquationOfState, apply
 
 export findvolume
 
 function findvolume(
-    form::EquationOfStateForm,
+    form::EquationForm,
     eos::EquationOfState,
     y::Real,
     domain::Union{AbstractVector,Tuple},
@@ -42,7 +42,7 @@ function findvolume(
     return find_zero(f, (minimum(domain), maximum(domain)), method)
 end # function findvolume
 function findvolume(
-    form::EquationOfStateForm,
+    form::EquationForm,
     eos::EquationOfState,
     y::Real,
     domain::Union{AbstractVector,Tuple},
@@ -52,7 +52,7 @@ function findvolume(
     return find_zero(f, median(domain), method)
 end # function findvolume
 function findvolume(
-    form::EquationOfStateForm,
+    form::EquationForm,
     eos::EquationOfState,
     y::Real,
     domain::Union{AbstractVector,Tuple},

src/NonlinearFitting.jl

@@ -13,7 +13,7 @@ module NonlinearFitting
 
 using LsqFit: curve_fit
 
-import ..EquationOfStateForm
+import ..EquationForm
 using ..Collections
 
 export lsqfit
@@ -24,15 +24,15 @@ export lsqfit
 Fit an equation of state using least-squares fitting method (with the Levenberg-Marquardt algorithm).
 
 # Arguments
-- `form::EquationOfStateForm`: an `EquationOfStateForm` instance. If `EnergyForm`, fit ``E(V)``; if `PressureForm`, fit ``P(V)``; if `BulkModulusForm`, fit ``B(V)``.
+- `form::EquationForm`: an `EquationForm` instance. If `EnergyForm`, fit ``E(V)``; if `PressureForm`, fit ``P(V)``; if `BulkModulusForm`, fit ``B(V)``.
 - `eos::EquationOfState`: a trial equation of state.
 - `xdata::AbstractVector`: a vector of volumes.
 - `ydata::AbstractVector`: a vector of energies, pressures, or bulk moduli.
 - `debug::Bool=false`: if `true`, then an `LsqFit.LsqFitResult` is returned, containing estimated Jacobian, residuals, etc.; if `false`, a fitted `EquationOfState` is returned. The default value is `false`.
 - `kwargs`: the rest keyword arguments that will be sent to `LsqFit.curve_fit`. See its [documentation](https://github.com/JuliaNLSolvers/LsqFit.jl/blob/master/README.md).
 """
 function lsqfit(
-    form::EquationOfStateForm,
+    form::EquationForm,
     eos::E,
     xdata::AbstractVector,
     ydata::AbstractVector;

src/prelude.jl

@@ -1,6 +1,6 @@
-export EquationOfStateForm, EnergyForm, PressureForm, BulkModulusForm
+export EquationForm, EnergyForm, PressureForm, BulkModulusForm
 
-abstract type EquationOfStateForm end
-struct EnergyForm <: EquationOfStateForm end
-struct PressureForm <: EquationOfStateForm end
-struct BulkModulusForm <: EquationOfStateForm end
+abstract type EquationForm end
+struct EnergyForm <: EquationForm end
+struct PressureForm <: EquationForm end
+struct BulkModulusForm <: EquationForm end