Changeset 25987 in project


Ignore:
Timestamp:
02/28/12 03:55:38 (9 years ago)
Author:
Ivan Raikov
Message:

nemo: using the make egg instead of the one from setup-api

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

Legend:

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

    r25870 r25987  
    136136
    137137(define fresh gensym)
     138
     139(define (alist? x)
     140  (every (lambda (x) (and (pair? x) (symbol? (car x)))) x))
    138141
    139142(define (lookup-def k lst . rest)
     
    11231126                           
    11241127                            ;; rate law
    1125                             (((or 'd 'D) ((and id (? symbol?))) '= (and expr (? expr?) ) . rest)
     1128                            ((or ((or 'd 'D) ((and id (? symbol?))) '= (and expr (? expr?) ) . (and rest (? alist?)))
     1129                                 ((or 'd 'D) ((and id (? symbol?))) '= . (and expr (? expr?) )))
     1130
     1131                             (print "diff eq match: expr = " expr )
    11261132                             (let* ((qid     (compute-qid id scope scope-subst))
    11271133                                    (scope-subst1 (update-subst id qid scope-subst))
    11281134                                    (qexpr   (subst-expr (parse-expr expr `(rate ,id)) scope-subst1))
     1135                                    (dd (print "qexpr = " qexpr))
    11291136                                    (rest    (filter identity rest))
    11301137                                    (initial ((lambda (x) (and x (subst-expr (parse-expr x `(rate ,id)) scope-subst)))
    11311138                                              (lookup-def 'initial rest))))
     1139                               (print "initial = " (lookup-def 'initial rest))
    11321140                               (env-extend! qid '(rate) (and initial (eval-const initial)) `(rhs ,qexpr))
    11331141                               (list (cons qid qs) scope-subst1)))
  • release/4/nemo/trunk/nemo-pyparams.scm

    r25870 r25987  
    470470               (lambda (x y) (string=? (->string x) (->string y)))))))
    471471
     472      (pp indent ,nl (Parameters = collections.namedtuple ("'Parameters'" "," []) ))
     473
    472474      (for-each (lambda (x)
    473475                  (pp indent ,(expr->string/python (cadr x) (python-name (car x)))))
  • release/4/nemo/trunk/nemo.meta

    r25655 r25987  
    1818 ; A list of eggs nemo depends on.
    1919
    20  (needs matchable sxml-transforms ssax sxpath
     20 (needs make matchable sxml-transforms ssax sxpath
    2121        datatype vector-lib environments digraph graph-bfs graph-cycles
    2222        mathh strictly-pretty varsubst (lalr 2.4.2)
  • release/4/nemo/trunk/nemo.setup

    r25870 r25987  
    44  (make-pathname #f fn ##sys#load-dynamic-extension))   
    55
    6 (define nemo-version 5.1)
     6(define nemo-version 5.2)
     7
     8(use make)
    79
    810(make (
Note: See TracChangeset for help on using the changeset viewer.