From da2e4ef8a8133150f2c947de58f9988880916d44 Mon Sep 17 00:00:00 2001
From: Sikorski <sikorski@zib.de>
Date: Sun, 12 May 2024 10:11:55 +0200
Subject: [PATCH] unique features

---
 scripts/villin.jl        | 16 ++++++----------
 src/simulators/openmm.jl |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/scripts/villin.jl b/scripts/villin.jl
index e668203..59cd7ac 100644
--- a/scripts/villin.jl
+++ b/scripts/villin.jl
@@ -5,13 +5,13 @@ using PyCall
 
 ## Config
 
-comment = "momenta"
+comment = "momenta-long-lowfriction"
 
 pdb = "data/villin nowater.pdb"
-steps = 10_000
+steps = 30_000
 step = 0.002
 temp = 310
-friction = 1
+friction = 0.01
 integrator = :langevinmiddle
 momenta = true
 features = 0.5 # 0 => backbone only
@@ -53,14 +53,9 @@ println("lagtime: $lagtime ns")
 println("simtime per generation: $simtime_per_gen ns")
 
 @time "creating system" sim = OpenMMSimulation(;
-    pdb, steps, forcefields, features, friction, step, momenta, temp, nthreads=1, mmthreads="gpu")
-
-if addwater
-    @time "adding water" sim = OpenMMSimulation(;
-        pdb, steps, forcefields, friction, step, momenta, temp, nthreads=1, mmthreads="gpu",
-        features=sim.features, addwater=true, padding, ionicstrength)
-end
+    pdb, steps, forcefields, features, friction, step, momenta, temp, nthreads=1, mmthreads="gpu", addwater, padding, ionicstrength)
 
+#=
 @pyimport openmm
 picosecond = openmm.unit.picosecond
 kelvin = openmm.unit.kelvin
@@ -74,6 +69,7 @@ elseif integrator == :varverlet
 elseif integrator == :nosehoover
     sim.pysim.context._integrator = openmm.NoseHooverIntegrator(sim.temp * kelvin, sim.friction / picosecond, sim.step * picosecond)
 end
+=#
 
 data = if readdata isa String
     @time "reading initial data" let i = ISOKANN.load(readdata)
diff --git a/src/simulators/openmm.jl b/src/simulators/openmm.jl
index 23b69c8..d92b398 100644
--- a/src/simulators/openmm.jl
+++ b/src/simulators/openmm.jl
@@ -94,7 +94,7 @@ function OpenMMSimulation(;
     pysim = @pycall py"defaultsystem"(pdb, ligand, forcefields, temp, friction, step, minimize; addwater, padding, ionicstrength, forcefield_kwargs)::PyObject
     if features isa Number
         radius = features
-        features = [calpha_pairs(pysim); local_atom_pairs(pysim, radius)]
+        features = [calpha_pairs(pysim); local_atom_pairs(pysim, radius)] |> unique
     end
     return OpenMMSimulation(pysim::PyObject, pdb, ligand, forcefields, temp, friction, step, steps, features, nthreads, mmthreads, momenta)
 end