Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:bvds/andes

  • Loading branch information...
commit e50c3ee76f8b3be040db19088aebd3937bd8ab17 2 parents 888789e + 627c6cc
@bvds authored
Showing with 8 additions and 5 deletions.
  1. +1 −1  KB/Ontology.cl
  2. +7 −4 KB/circuit-ontology.cl
View
2  KB/Ontology.cl
@@ -189,7 +189,7 @@
((or "gravitational" "weight" "grav." "grav") "force")))
;"normal force exerted on a body by the surface" from Y&F
(normal '("normal force"))
- (tension '(or "tension" "pulling force"))
+ (tension '(or ("tension" (allowed "force")) "pulling force"))
(applied '((allowed "applied") "force")) ;catch-all force
(kinetic-friction '(((preferred "kinetic") (or "friction" "frictional"))
"force"))
View
11 KB/circuit-ontology.cl
@@ -148,7 +148,7 @@
:symbol-base |C|
:short-name "capacitance"
:units |F|
- :new-english (property-object "capacitance" ?name))
+ :new-english (property-object "capacitance" (or (var (body ?name)) ?name) ))
;;; in the workbench, the time slot is added if feature changing-voltage
;;; is included.
@@ -156,7 +156,7 @@
:symbol-base |q|
:short-name "charge"
:units |C|
- :new-english ((the) "charge on" ?name (time ?time)))
+ :new-english ((the) "charge on" (or (var (body ?name)) ?name) (time ?time)))
;;; in the workbench, the time slot is added if feature changing-voltage
;;; is included.
@@ -172,10 +172,13 @@
:symbol-base |q|
:short-name "charge"
:units |C|
- :new-english ((the) "charge in" ?name (time ?time)))
+ :new-english ((the) "charge in" (or (var (body ?name)) ?name) (time ?time)))
(def-qexp max-charge (max-charge ?name :time ?time)
- :units |C|)
+ :symbol-base |q|
+ :short-name "max-charge"
+ :units |C|
+ :new-english ((the) or("maximum" "max") "charge in" (or (var (body ?name)) ?name) (time ?time)))
(def-qexp self-inductance (self-inductance ?inductor)
:symbol-base |L|
Please sign in to comment.
Something went wrong with that request. Please try again.