Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/ein16/synth/d2/obj_operator.py
ViewVC logotype

Diff of /branches/ein16/synth/d2/obj_operator.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4342, Tue Aug 2 13:44:43 2016 UTC revision 4343, Tue Aug 2 14:38:15 2016 UTC
# Line 82  Line 82 
82    
83  #Trig  #Trig
84  id=id+9  id=id+9
 op_sqrt = operator(id, "sqrt", 1, u'sqrt', place_left)  
85    
86  op_cosine = operator(id+1, "cosine", 1, u'cosF', place_left)  op_cosine = operator(id, "cosine", 1, u'cosF', place_left)
87  op_sine = operator(id+2, "sine", 1, u'sinF', place_left)  op_sine = operator(id+1, "sine", 1, u'sinF', place_left)
88  op_atangent = operator(id+3, "arctangent", 1, u'atanF', place_left)  op_atangent = operator(id+2, "arctangent", 1, u'atanF', place_left)
89    
90  # limit between -1 and 1  # limit between -1 and 1
91  op_tangent = operator(id+4, "tangent", 1, u'tanF', place_left)  op_tangent = operator(id+3, "tangent", 1, u'tanF', place_left)
92  op_acosine = operator(id+5, "arccosine", 1, u'acosF', place_left)  op_acosine = operator(id+4, "arccosine", 1, u'acosF', place_left)
93  op_asine = operator(id+6, "arcsine", 1, u'asinF', place_left)  op_asine = operator(id+5, "arcsine", 1, u'asinF', place_left)
94    op_sqrt = operator(id+6, "sqrt", 1, u'sqrt', place_left)
95    
96    op_trig=[ op_cosine, op_sine, op_atangent]#, op_tangent, op_acosine, op_asine,op_sqrt]
97    
98  op_trig=[op_sqrt, op_cosine, op_sine, op_atangent]#, op_tangent, op_acosine, op_asine]  op_all = op_unary+op_binary#+op_trig
   
 op_all = op_unary+op_binary+op_trig  
99    
100  i=0  i=0
101  for op1 in op_all:  for op1 in op_all:

Legend:
Removed from v.4342  
changed lines
  Added in v.4343

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0