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 4410, Fri Aug 12 18:28:32 2016 UTC revision 4411, Fri Aug 12 18:28:57 2016 UTC
# Line 68  Line 68 
68    
69  #binary operators  #binary operators
70  id=id+6  id=id+6
71  print"addition id",id  #print"addition id",id
72  op_add = operator(id,"addition", 2,"+", place_middle)  op_add = operator(id,"addition", 2,"+", place_middle)
73  op_subtract = operator(id+1,"subtraction", 2, "-", place_middle)  op_subtract = operator(id+1,"subtraction", 2, "-", place_middle)
74  op_cross = operator(id+2,"cross product", 2, u'×', place_middle)  op_cross = operator(id+2,"cross product", 2, u'×', place_middle)
# Line 80  Line 80 
80  op_doubledot= operator(id+8,"op_doubledot", 2, u':', place_middle)  op_doubledot= operator(id+8,"op_doubledot", 2, u':', place_middle)
81  op_binary = [op_add, op_subtract, op_cross, op_outer, op_inner, op_scale, op_division, op_modulate, op_doubledot]  op_binary = [op_add, op_subtract, op_cross, op_outer, op_inner, op_scale, op_division, op_modulate, op_doubledot]
82    
83  #Trig  
84  id=id+9  id=id+9
85    op_inverse = operator(id, "inverse", 1, u'inv', place_left)
86    
87    #Trig
88    id=id+10
89  op_cosine = operator(id, "cosine", 1, u'cosF', place_left)  op_cosine = operator(id, "cosine", 1, u'cosF', place_left)
90  op_sine = operator(id+1, "sine", 1, u'sinF', place_left)  op_sine = operator(id+1, "sine", 1, u'sinF', place_left)
91  op_atangent = operator(id+2, "arctangent", 1, u'atanF', place_left)  op_atangent = operator(id+2, "arctangent", 1, u'atanF', place_left)
# Line 95  Line 98 
98    
99  op_trig=[ op_cosine, op_sine, op_atangent]#, op_tangent, op_acosine, op_asine,op_sqrt]  op_trig=[ op_cosine, op_sine, op_atangent]#, op_tangent, op_acosine, op_asine,op_sqrt]
100    
101  op_all = op_unary+op_binary#+op_trig  op_all = op_unary+op_binary+[op_inverse]#+op_trig
102    
103  i=0  i=0
104  for op1 in op_all:  for op1 in op_all:

Legend:
Removed from v.4410  
changed lines
  Added in v.4411

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