rename merge to mergedata

axsk · Aug 23, 2024 · be88b74 · be88b74
1 parent 2b498b8
commit be88b74
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/scripts/multitraj.jl b/scripts/multitraj.jl
@@ -26,8 +26,6 @@ datas = map(trajfiles) do trajfile
     data = data_from_trajectory(feats, reverse=true)
 end
 
-mergedata(d1, d2) = lastcat.(d1, d2)
-
 data = reduce(mergedata, datas)
 
 iso = Iso(data)

diff --git a/src/data.jl b/src/data.jl
@@ -86,6 +86,7 @@ function adddata(data, model, sim, ny)
     return joindata(data, (xs, ys))
 end
 
+mergedata(d1::Tuple, d2::Tuple) = lastcat.(d1, d2)
 
 lastcat(x::T, y::T) where {N,T<:AbstractArray{<:Any,N}} = cat(x, y, dims=N)
 lastcat(x::T, y) where {T} = lastcat(x, convert(T, y))

diff --git a/src/extrapolate.jl b/src/extrapolate.jl
@@ -16,7 +16,7 @@ function addextrapolates!(iso, n; stepsize=0.01, steps=1)
     n == 0 && return
     xs = extrapolate(iso, n, stepsize, steps)
     nd = SimulationData(iso.data.sim, xs, nk(iso.data))
-    iso.data = merge(iso.data, nd)
+    iso.data = mergedata(iso.data, nd)
     return
 end
 

diff --git a/src/simulation.jl b/src/simulation.jl
@@ -131,12 +131,12 @@ pdb(s::SimulationData) = pdb(s.sim)
 
 
 """
-    merge(d1::SimulationData, d2::SimulationData)
+    mergedata(d1::SimulationData, d2::SimulationData)
 
 Merge the data and features of `d1` and `d2`, keeping the simulation and features of `d1`.
 Note that there is no check if simulation features agree.
 """
-function Base.merge(d1::SimulationData, d2::SimulationData)
+function mergedata(d1::SimulationData, d2::SimulationData)
     coords = lastcat.(d1.coords, d2.coords)
     d2f = if d1.featurizer == d2.featurizer
         d2.features
@@ -147,8 +147,11 @@ function Base.merge(d1::SimulationData, d2::SimulationData)
     return SimulationData(d1.sim, features, coords, d1.featurizer)
 end
 
+@deprecate Base.merge(d1::SimulationData, d2::SimulationData) mergedata(d1, d2) false
+
+
 function addcoords(d::SimulationData, coords::AbstractMatrix)
-    merge(d, SimulationData(d.sim, coords, nk(d), featurizer=d.featurizer))
+    mergedata(d, SimulationData(d.sim, coords, nk(d), featurizer=d.featurizer))
 end