From 1fb3df1403a01a7f6df4101a51618c3c8fed9bd2 Mon Sep 17 00:00:00 2001
From: Connor Olding <cloningdonor@gmail.com>
Date: Mon, 29 Sep 2014 21:47:58 -0700
Subject: [PATCH] .

---
 strings.py | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/strings.py b/strings.py
index 35d1492..f2840a4 100755
--- a/strings.py
+++ b/strings.py
@@ -13,7 +13,7 @@ string_sets = {
         ('A2' , 16, 'NW'),
         ('E2' , 16, 'NW'),
     ),
-    'light jazz': (
+    'jazz light': (
         ('E4' , 24, 'PL'),
         ('B3' , 24, 'PL'),
         ('G3' , 24, 'NW'),
@@ -29,7 +29,7 @@ string_sets = {
         ('A2' , 16, 'NW'),
         ('D2' , 16, 'NW'),
     ),
-    'open G (6-string)': (
+    'regular light (open G, 6)': (
         ('D4' , 16, 'PL'),
         ('B3' , 16, 'PL'),
         ('G3' , 16, 'PL'),
@@ -37,7 +37,7 @@ string_sets = {
         ('B2' , 16, 'NW'),
         ('D2' , 16, 'NW'),
     ),
-    'open G (7-string)': (
+    'regular light (open G, 7)': (
         ('D4' , 16, 'PL'),
         ('B3' , 16, 'PL'),
         ('G3' , 16, 'PL'),
@@ -83,7 +83,7 @@ stock = (
     ('NW021' , .00008293),
     ('NW022' , .00009184),
     ('NW024' , .00010857),
-    # they have a NW025 used in EXL110BT but it's not listed
+    ('NW025*', .00011875), # from the EXL110BT, an approximation
     ('NW026' , .00012671),
     ('NW028' , .00014666),
     ('NW030' , .00017236),
@@ -157,6 +157,8 @@ if False:
     test('D3' , 146.83)
     test('A2' , 110.00)
     test('E2' ,  82.41)
+    import sys
+    sys.exit(0)
 
 uw_const = 386.4
 def uw2tension(uw, freq):
@@ -165,6 +167,15 @@ def uw2tension(uw, freq):
 def tension2uw(t, freq):
     return (t*uw_const)/(2*scale_length*freq)**2
 
+if False:
+    scale_length = 25.4825
+    D3 = note2freq('D3')
+    print('NW024  {:10.8f} == 0.00010857'.format(tension2uw(15.73, D3)))
+    print('NW025* {:10.8f} == ?         '.format(tension2uw(17.21, D3)))
+    print('NW026  {:10.8f} == 0.00012671'.format(tension2uw(18.38, D3)))
+    import sys
+    sys.exit(0)
+
 outfmt = '{:<6} at {:> 5.2f} lbs ({:>+4.2f})'
 finalfmt = 'total:   {:>7.2f} lbs ({:>+5.2f})'
 def print_ideal_stock(strings):