Author: bugman
Date: Mon Apr 14 18:22:09 2014
New Revision: 22747
URL: http://svn.gna.org/viewcvs/relax?rev=22747&view=rev
Log:
More updates of the N-state model sample scripts for the value.set user
function changes.
Modified:
trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
trunk/sample_scripts/n_state_model/local_min_search.py
trunk/sample_scripts/n_state_model/two_domain.py
Modified: trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/conformation_analysis_rdc%2Bpcs.py?rev=22747&r1=22746&r2=22747&view=diff
==============================================================================
--- trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py
(original)
+++ trunk/sample_scripts/n_state_model/conformation_analysis_rdc+pcs.py Mon
Apr 14 18:22:09 2014
@@ -149,7 +149,7 @@
# Set to equal probabilities.
for j in range(NUM_STR):
- value.set(1.0/NUM_STR, 'p'+`j`)
+ value.set(1.0/NUM_STR, 'probs', index=j)
# Minimisation.
minimise('bfgs', constraints=True)
Modified: trunk/sample_scripts/n_state_model/local_min_search.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/local_min_search.py?rev=22747&r1=22746&r2=22747&view=diff
==============================================================================
--- trunk/sample_scripts/n_state_model/local_min_search.py (original)
+++ trunk/sample_scripts/n_state_model/local_min_search.py Mon Apr 14
18:22:09 2014
@@ -68,7 +68,7 @@
# Set the random probabilities.
for j in range(cdp.N):
- value.set(probs[j], 'p'+`j`)
+ value.set(probs[j], 'probs', index=j)
# Reset the tensors.
#for i in range(len(cdp.align_tensors)):
Modified: trunk/sample_scripts/n_state_model/two_domain.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/n_state_model/two_domain.py?rev=22747&r1=22746&r2=22747&view=diff
==============================================================================
--- trunk/sample_scripts/n_state_model/two_domain.py (original)
+++ trunk/sample_scripts/n_state_model/two_domain.py Mon Apr 14 18:22:09
2014
@@ -124,10 +124,10 @@
print("%-16s [%12.8f, %12.8f, %12.8f, %12.8f, %12.8f]" % ("beta",
cdp.beta[0], cdp.beta[1], cdp.beta[2], cdp.beta[3], cdp.beta[4]))
print("%-16s [%12.8f, %12.8f, %12.8f, %12.8f, %12.8f]" % ("gamma",
cdp.gamma[0], cdp.gamma[1], cdp.gamma[2], cdp.gamma[3], cdp.gamma[4]))
print("\n\n")
-print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], ['p0', 'p1',
'p2', 'p3', 'p4'])" % (cdp.probs[0], cdp.probs[1], cdp.probs[2],
cdp.probs[3], cdp.probs[4]))
-print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], ['alpha0',
'alpha1', 'alpha2', 'alpha3', 'alpha4'])" % (cdp.alpha[0], cdp.alpha[1],
cdp.alpha[2], cdp.alpha[3], cdp.alpha[4]))
-print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], ['beta0',
'beta1', 'beta2', 'beta3', 'beta4'])" % (cdp.beta[0], cdp.beta[1],
cdp.beta[2], cdp.beta[3], cdp.beta[4]))
-print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], ['gamma0',
'gamma1', 'gamma2', 'gamma3', 'gamma4'])" % (cdp.gamma[0], cdp.gamma[1],
cdp.gamma[2], cdp.gamma[3], cdp.gamma[4]))
+print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], 'probs', ['p0',
'p1', 'p2', 'p3', 'p4'], index=[0, 1, 2, 3, 4])" % (cdp.probs[0],
cdp.probs[1], cdp.probs[2], cdp.probs[3], cdp.probs[4]))
+print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], 'alpha',
index=[0, 1, 2, 3, 4])" % (cdp.alpha[0], cdp.alpha[1], cdp.alpha[2],
cdp.alpha[3], cdp.alpha[4]))
+print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], 'beta', index=[0,
1, 2, 3, 4])" % (cdp.beta[0], cdp.beta[1], cdp.beta[2], cdp.beta[3],
cdp.beta[4]))
+print("value.set([%12.8f, %12.8f, %12.8f, %12.8f, %12.8f], 'gamma',
index=[0, 1, 2, 3, 4])" % (cdp.gamma[0], cdp.gamma[1], cdp.gamma[2],
cdp.gamma[3], cdp.gamma[4]))
print("# fk: %s" % cdp.chi2)
# Pivot point.
r22747 - in /trunk/sample_scripts/n_state_model: conformation_analysis_rdc+pcs.py local_min_search.py two_domain.py