From: blackh <gra...@li...> - 2002-01-04 20:58:18
|
blackh Fri Jan 4 12:58:17 2002 EDT Modified files: /grapevine/raisen/grapevine vector.xml Log: Tweaks. Index: grapevine/raisen/grapevine/vector.xml diff -u grapevine/raisen/grapevine/vector.xml:1.1 grapevine/raisen/grapevine/vector.xml:1.2 --- grapevine/raisen/grapevine/vector.xml:1.1 Fri Jan 4 12:34:53 2002 +++ grapevine/raisen/grapevine/vector.xml Fri Jan 4 12:58:17 2002 @@ -11,7 +11,7 @@ ... --> <grapevine> - <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.1 2002/01/04 20:34:53 blackh Exp $"> + <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.2 2002/01/04 20:58:17 blackh Exp $"> <rules> <!-- Format of various facts @@ -48,7 +48,7 @@ bits = endBit - startBit, value = ((vector >> startBit) & ((1 << bits)-1)) << (160-bits), fire new <co-ord vector="[vector]" no="[no]" value="[value]"/>, - s#no = s#no + 1; + s#no = s#no + 1; <!-- Causes this rule to re-fire --> sum_squares: d=<distance a="[a]" b="[b]"/>, |
From: blackh <gra...@li...> - 2002-01-05 05:35:29
|
blackh Fri Jan 4 21:35:28 2002 EDT Modified files: /grapevine/raisen/grapevine vector.xml Log: Index: grapevine/raisen/grapevine/vector.xml diff -u grapevine/raisen/grapevine/vector.xml:1.2 grapevine/raisen/grapevine/vector.xml:1.3 --- grapevine/raisen/grapevine/vector.xml:1.2 Fri Jan 4 12:58:17 2002 +++ grapevine/raisen/grapevine/vector.xml Fri Jan 4 21:35:28 2002 @@ -11,7 +11,7 @@ ... --> <grapevine> - <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.2 2002/01/04 20:58:17 blackh Exp $"> + <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.3 2002/01/05 05:35:28 blackh Exp $"> <rules> <!-- Format of various facts @@ -47,18 +47,25 @@ endBit = ((no+1) * 160) / dims, bits = endBit - startBit, value = ((vector >> startBit) & ((1 << bits)-1)) << (160-bits), - fire new <co-ord vector="[vector]" no="[no]" value="[value]"/>, + <!-- Can't use fire here, because we need to have the results + of two splits in memory at the same time. + \todo: Better to use 'assert' here, but we need to extend the + language to allow detaching the <dimensions/> fact as an + assert parent --> + remember new <co-ord vector="[vector]" no="[no]" value="[value]"/>, s#no = s#no + 1; <!-- Causes this rule to re-fire --> sum_squares: d=<distance a="[a]" b="[b]"/>, !bound(d#dist), - <co-ord vector="[a]" no="[no]" value="[v1]"/>, - <co-ord vector="[b]" no="[no]" value="[v2]"/>, + c1=<co-ord vector="[a]" no="[no]" value="[v1]"/>, + c2=<co-ord vector="[b]" no="[no]" value="[v2]"/>, + retract c1, + retract c2, diff = v1 - v2, square = diff * diff, d#sum\-of\-squares = d#sum\-of\-squares + square; - + square_root: d=<distance a="[a]" b="[b]"/>, !bound(d#dist), |
From: blackh <gra...@li...> - 2002-01-06 01:21:38
|
blackh Sat Jan 5 17:21:37 2002 EDT Modified files: /grapevine/raisen/grapevine vector.xml Log: Bug fix. Index: grapevine/raisen/grapevine/vector.xml diff -u grapevine/raisen/grapevine/vector.xml:1.4 grapevine/raisen/grapevine/vector.xml:1.5 --- grapevine/raisen/grapevine/vector.xml:1.4 Sat Jan 5 17:15:37 2002 +++ grapevine/raisen/grapevine/vector.xml Sat Jan 5 17:21:37 2002 @@ -11,7 +11,7 @@ ... --> <grapevine> - <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.4 2002/01/06 01:15:37 blackh Exp $"> + <grapevine.vector author1="Stephen Blackheath" rev="$Id: vector.xml,v 1.5 2002/01/06 01:21:37 blackh Exp $"> <rules> <!-- Format of various facts @@ -53,7 +53,7 @@ value = shiftLeft( shiftRight(vector, startBit) & (shiftLeft(1, bits)-1), - 160-bits) + lengthBits-bits) ), <!-- Can't use fire here, because we need to have the results of two splits in memory at the same time. |
From: blackh <gra...@li...> - 2003-12-02 03:25:17
|
blackh Mon Dec 1 18:57:43 2003 EDT Modified files: /grapevine/raisen/grapevine vector.xml Log: Bug fix. Index: grapevine/raisen/grapevine/vector.xml diff -u grapevine/raisen/grapevine/vector.xml:1.19 grapevine/raisen/grapevine/vector.xml:1.20 --- grapevine/raisen/grapevine/vector.xml:1.19 Sun Nov 30 21:32:18 2003 +++ grapevine/raisen/grapevine/vector.xml Mon Dec 1 18:57:43 2003 @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: vector.xml,v 1.19 2003/12/01 05:32:18 blackh Exp $ --> +<!-- $Id: vector.xml,v 1.20 2003/12/02 02:57:43 blackh Exp $ --> <!DOCTYPE grapevine SYSTEM "../raisen.dtd" [ @@ -57,7 +57,7 @@ dist != "", --> <grapevine> - <domain name="grapevine.vector" author1="Stephen Blackheath" rev="$Revision: 1.19 $"> + <domain name="grapevine.vector" author1="Stephen Blackheath" rev="$Revision: 1.20 $"> <facts> <!-- Space is 6-dimensional --> @@ -122,7 +122,7 @@ sum_squares-10: d=<distance a="[a]" b="[b]" dist="" id="[id]"/>, - c1=<co-ord which="a" no="[no]" value="[v1]" id="[id]" size="[zie]"/>, + c1=<co-ord which="a" no="[no]" value="[v1]" id="[id]"/>, c2=<co-ord which="b" no="[no]" value="[v2]" id="[id]"/>, retract c1, retract c2, |