Skip to content

Commit b8a75cc

Browse files
author
Christian Schafmeisterr
committed
A bunch of changes
The big one is I started using the mathkernel generated energy functions. I swapped the old _Stretch_termCode.cc out for the new stretch_energy, stretch_gradient, stretch_hessian functions. The energyStretch.cc file is pretty messy right now. I'll clean it up when I add the nonbond code.
1 parent 954238b commit b8a75cc

File tree

12 files changed

+1361
-1065
lines changed

12 files changed

+1361
-1065
lines changed

include/cando/chem/energyComponent.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ This is an open source license for the CANDO software from Temple University, bu
5050
#include <cando/chem/scoringFunction.h>
5151
#include <cando/chem/residue.h>
5252

53+
#define SIZE_T size_t
54+
5355
//
5456
// SCALE FACTOR FOR ELECTROSTIC INTERACTIONS???
5557
//

include/cando/chem/energyFunction.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,12 @@ FORWARD(BoundingBox);
9797

9898
core::T_sp specializeKeepInteractionFactory( core::T_sp keepInteractionFactory, core::T_sp aclass );
9999

100+
bool skipInteraction_EnergyNonbond( core::T_sp keepInteractionFunction,
101+
Atom_sp atomA,
102+
Atom_sp atomB,
103+
core::T_sp ti3A,
104+
core::T_sp ti3B );
105+
100106
bool skipInteraction( core::T_sp keepInteractionFunction,
101107
Atom_sp atomA = unbound<Atom_O>(),
102108
Atom_sp atomB = unbound<Atom_O>(),

include/cando/chem/energyNonbond.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ class EnergyNonbond_O : public EnergyComponent_O
273273
core::List_sp nonbondTermsAsAList();
274274

275275
void setNonbondExcludedAtomInfo(AtomTable_sp atom_table, core::SimpleVector_int32_t_sp excluded_atoms_list, core::SimpleVector_int32_t_sp number_excluded_atoms);
276+
void checkEnergyNonbond();
276277
EnergyNonbond_sp copyFilter(core::T_sp keepInteractionFactory);
277278
public:
278279
EnergyNonbond_O( const EnergyNonbond_O& ss ); //!< Copy constructor

include/cando/chem/scoringFunction.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,10 @@ class ScoringFunction_O : public core::CxxObject_O
250250
core::T_sp activeAtomMask,
251251
core::T_sp debugInteractions=nil<core::T_O>(),
252252
bool disableRestraints=false);
253+
#if 0
253254
virtual double evaluateEnergyForceFullHessianForDebugging(core::T_sp energyScale, core::T_sp activeAtomMask, core::T_sp debugInteractions,
254255
bool disableRestraints);
256+
#endif
255257

256258
void evaluateFiniteDifferenceForce(NVector_sp pos, core::T_sp energyScale, NVector_sp force, double delta=0.00001, core::T_sp activeAtomMask=nil<core::T_O>() );
257259
#if 0

include/cando/main/extension.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ typedef int32_t vecint;
5151
#define NVECTOR_sp_TYPE core::SimpleVector_float_sp
5252
#endif
5353

54+
#define DOUBLE vecreal
55+
5456
#if NUM_REAL == VECREAL_DOUBLE
5557
typedef double num_real;
5658
typedef int64_t num_int;

0 commit comments

Comments
 (0)