Changeset 17889 in project


Ignore:
Timestamp:
04/23/10 12:08:46 (9 years ago)
Author:
Ivan Raikov
Message:

nemo: more uniform code generaton for octave and nmodl

Location:
release/4/nemo/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • release/4/nemo/trunk/nemo-matlab.scm

    r17793 r17889  
    264264  (match-let (((g cnode node-subs)  (transitions-graph n open transitions conserve matlab-state-name)))
    265265    (let ((nodes ((g 'nodes))))
    266       (if (< 2 (length nodes))
    267           (list (matlab-name n) `(/ ,(matlab-state-name n open)
    268                                     ,(sum (filter-map (lambda (x) (and (not (= (first x) (first cnode)))
    269                                                                        (matlab-state-name n (second x)))) nodes))))
    270           (list (matlab-name n) (matlab-state-name n open))))))
     266;      (if (< 2 (length nodes))
     267;         (list (matlab-name n) `(abs (/ ,(matlab-state-name n open)
     268;                                        ,(sum (filter-map (lambda (x) (and (not (= (first x) (first cnode)))
     269;                                                                           (matlab-state-name n (second x)))) nodes)))))
     270          (list (matlab-name n) (matlab-state-name n open)))))
    271271
    272272
  • release/4/nemo/trunk/nemo-nmodl.scm

    r17793 r17889  
    466466
    467467
    468 (define (reaction-eq n open transitions)
    469   (list (nmodl-name n) (nmodl-name (nmodl-state-name n open))))
     468(define (reaction-eq n open transitions conserve)
     469  (list (nmodl-name n) (nmodl-state-name n open)))
    470470
    471471(define (poset->reaction-eq-defs poset sys kinetic)
     
    478478                               (cases nemo:quantity en
    479479                                      (REACTION  (name initial open transitions conserve power)
    480                                                  (cons (reaction-eq name open transitions) ax))
     480                                                 (cons (reaction-eq name open transitions conserve) ax))
    481481
    482482                                      (else  ax))
Note: See TracChangeset for help on using the changeset viewer.