Skip to content

Commit 29ccf37

Browse files
committed
ambr maxAux maxAdd1
1 parent 0fbecc2 commit 29ccf37

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

docs/articles/programming-with-interaction-nets.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -505,20 +505,20 @@ But because of single-principal-port constraint,
505505
we have to introduce an auxiliary node and some auxiliary rules,
506506
to explicitly choose between two interactable edges.
507507

508-
We call the auxiliary node `(maxAux)`.
508+
We call the auxiliary node `(maxAdd1)`.
509509

510510
```
511511
result
512512
|
513-
(maxAux)
513+
(maxAdd1)
514514
/ \
515515
first second!
516516
```
517517

518518
Node definition:
519519

520520
```
521-
node maxAux(
521+
node maxAdd1(
522522
first: Nat,
523523
second!: Nat
524524
--------
@@ -532,7 +532,7 @@ the rule between `(max)` and `(add1)`:
532532
```
533533
result result
534534
| |
535-
(max) => (maxAux)
535+
(max) => (maxAdd1)
536536
/ \ / \
537537
(add1) second prev second
538538
|
@@ -543,34 +543,34 @@ Rule definition:
543543

544544
```
545545
rule max(first!, second, result) add1(prev, value!) {
546-
maxAux(prev, second, result)
546+
maxAdd1(prev, second, result)
547547
}
548548
```
549549

550-
The rule between `(maxAux)` and `(zero)`:
550+
The rule between `(maxAdd1)` and `(zero)`:
551551

552552
```
553553
result result
554554
| |
555-
(maxAux) => (add1)
555+
(maxAdd1) => (add1)
556556
/ \ |
557557
first (zero) first
558558
```
559559

560560
Rule definition:
561561

562562
```
563-
rule maxAux(first, second!, result) zero(value!) {
563+
rule maxAdd1(first, second!, result) zero(value!) {
564564
add1(first, result)
565565
}
566566
```
567567

568-
The rule between `(maxAux)` and `(add1)`:
568+
The rule between `(maxAdd1)` and `(add1)`:
569569

570570
```
571571
result result
572572
| |
573-
(maxAux) => (add1)
573+
(maxAdd1) => (add1)
574574
/ \ |
575575
first (add1) (max)
576576
| / \
@@ -580,7 +580,7 @@ The rule between `(maxAux)` and `(add1)`:
580580
Rule definition:
581581

582582
```
583-
rule maxAux(first, second!, result) add1(prev, value!) {
583+
rule maxAdd1(first, second!, result) add1(prev, value!) {
584584
add1(max(first, prev), result)
585585
}
586586
```
@@ -601,7 +601,7 @@ node add1(
601601
value!: Nat
602602
)
603603
604-
node maxAux(
604+
node maxAdd1(
605605
first: Nat,
606606
second!: Nat
607607
--------
@@ -620,14 +620,14 @@ rule max(first!, second, result) zero(value!) {
620620
}
621621
622622
rule max(first!, second, result) add1(prev, value!) {
623-
maxAux(prev, second, result)
623+
maxAdd1(prev, second, result)
624624
}
625625
626-
rule maxAux(first, second!, result) zero(value!) {
626+
rule maxAdd1(first, second!, result) zero(value!) {
627627
add1(first, result)
628628
}
629629
630-
rule maxAux(first, second!, result) add1(prev, value!) {
630+
rule maxAdd1(first, second!, result) add1(prev, value!) {
631631
add1(max(first, prev), result)
632632
}
633633

docs/articles/反应网编程.md

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -482,21 +482,20 @@ rule max(first!, second, result) zero(value!) {
482482
我们不得不增加一个辅助节点以及相关的规则,
483483
来明显地在两个可反应的边中做出选择。
484484

485-
我们称辅助节点为 `(maxAux)`
486-
其中 `aux` 是 auxiliary 的所写。
485+
我们称辅助节点为 `(maxAdd1)`
487486

488487
```
489488
result
490489
|
491-
(maxAux)
490+
(maxAdd1)
492491
/ \
493492
first second!
494493
```
495494

496495
定义如下:
497496

498497
```
499-
node maxAux(
498+
node maxAdd1(
500499
first: Nat,
501500
second!: Nat
502501
--------
@@ -509,7 +508,7 @@ node maxAux(
509508
```
510509
result result
511510
| |
512-
(max) => (maxAux)
511+
(max) => (maxAdd1)
513512
/ \ / \
514513
(add1) second prev second
515514
|
@@ -520,34 +519,34 @@ node maxAux(
520519

521520
```
522521
rule max(first!, second, result) add1(prev, value!) {
523-
maxAux(prev, second, result)
522+
maxAdd1(prev, second, result)
524523
}
525524
```
526525

527-
`(maxAux)``(zero)` 之间的规则:
526+
`(maxAdd1)``(zero)` 之间的规则:
528527

529528
```
530529
result result
531530
| |
532-
(maxAux) => (add1)
531+
(maxAdd1) => (add1)
533532
/ \ |
534533
first (zero) first
535534
```
536535

537536
定义如下:
538537

539538
```
540-
rule maxAux(first, second!, result) zero(value!) {
539+
rule maxAdd1(first, second!, result) zero(value!) {
541540
add1(first, result)
542541
}
543542
```
544543

545-
`(maxAux)``(add1)` 之间的规则:
544+
`(maxAdd1)``(add1)` 之间的规则:
546545

547546
```
548547
result result
549548
| |
550-
(maxAux) => (add1)
549+
(maxAdd1) => (add1)
551550
/ \ |
552551
first (add1) (max)
553552
| / \
@@ -557,7 +556,7 @@ rule maxAux(first, second!, result) zero(value!) {
557556
定义如下:
558557

559558
```
560-
rule maxAux(first, second!, result) add1(prev, value!) {
559+
rule maxAdd1(first, second!, result) add1(prev, value!) {
561560
add1(max(first, prev), result)
562561
}
563562
```
@@ -578,7 +577,7 @@ node add1(
578577
value!: Nat
579578
)
580579
581-
node maxAux(
580+
node maxAdd1(
582581
first: Nat,
583582
second!: Nat
584583
--------
@@ -597,14 +596,14 @@ rule max(first!, second, result) zero(value!) {
597596
}
598597
599598
rule max(first!, second, result) add1(prev, value!) {
600-
maxAux(prev, second, result)
599+
maxAdd1(prev, second, result)
601600
}
602601
603-
rule maxAux(first, second!, result) zero(value!) {
602+
rule maxAdd1(first, second!, result) zero(value!) {
604603
add1(first, result)
605604
}
606605
607-
rule maxAux(first, second!, result) add1(prev, value!) {
606+
rule maxAdd1(first, second!, result) add1(prev, value!) {
608607
add1(max(first, prev), result)
609608
}
610609

examples/datatypes/Nat.i

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ rule mul(target!, mulend, result) add1(prev, value!) {
9090
add(second, mul(first, prev), result)
9191
}
9292

93-
// To define `max`, we need `maxAux`.
93+
// To define `max`, we need `maxAdd1`.
9494

95-
node maxAux(
95+
node maxAdd1(
9696
first: Nat,
9797
second!: Nat
9898
--------
@@ -111,13 +111,13 @@ rule max(first!, second, result) zero(value!) {
111111
}
112112

113113
rule max(first!, second, result) add1(prev, value!) {
114-
maxAux(prev, second, result)
114+
maxAdd1(prev, second, result)
115115
}
116116

117-
rule maxAux(first, second!, result) zero(value!) {
117+
rule maxAdd1(first, second!, result) zero(value!) {
118118
add1(first, result)
119119
}
120120

121-
rule maxAux(first, second!, result) add1(prev, value!) {
121+
rule maxAdd1(first, second!, result) add1(prev, value!) {
122122
add1(max(first, prev), result)
123123
}

0 commit comments

Comments
 (0)