activefacts 0.8.18 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmQ1ZmI4YjNlNGZhMjJhZDQwODcwNDNkMWM1ZTQ5YWE2NjNkZTRiNA==
+    YTM2ZWY5NmY5NDYzYmRiN2I3YmE1ODMxZDVlOWNjNmNhNWZjOTY5Nw==
   data.tar.gz: !binary |-
-    YzkzY2M3MDkzMDc5MGNmMTkyNGNmY2U2ZWUyNjQ2MjljODI5YmFkYw==
+    MmY5MjQ3NTUwMjBhOTg5YWVkNDAzMGJlZThiODY3OWRiYWNmM2JmYw==
 SHA512:
   metadata.gz: !binary |-
-    ZDgxMzZkODViOWE2MDU1MTdiODMwZDhjMzVjN2E2NmUwNjRlOTczZTJlMTU4
-    M2YxM2M5ZWUzZWQ1NWEwYjc5ZTIxNjg2MjQ0MjJmMzYwZjE1MmMwZGIyODFh
-    MTVlODhiNWY0ZTNiNWQ3ZmUzZDFhMTUzYzhmMGE0YTM1Y2YyNTg=
+    MDc1NTczMTI4NmQyNGU5MTIwMzI1ZmVlNzA4MTE3OGM1NjVlYzMyZjA0NGMx
+    YWU1OThkOTU1YWE5YTYyZjAyODkxMDhiMzYzMzQyMWRhYTViMDJhNDc1ODA0
+    NmUwMjdhMmE3YTFkMzU5ZjgxYjIwMWJlYWJmZmE5ZmY2NmFlY2E=
   data.tar.gz: !binary |-
-    YWU2OTdlNTcxYTRjYjNjMzAxNjYzNTk0NDM1YmY3YzQ1NWI4YTczZDc2Nzlk
-    NTgxMmEwZWUyNzc2ZmU4MTAwYjNmMzBkNGM3M2I2OTM0M2MyZDM1NTcxZjNi
-    OGQzODQwMWQxNTFhNTRkYWU5M2QzODMyNDUwZTE1MjhjNTdiNWQ=
+    ZTE1MmU1OWE3Y2RiYTBiNDk5NTM0NTllZGFiZDFmM2Q2YjQxYzNkODIzMWE3
+    MmI3NGU3YmQ0ZTE1Yjc5ZWVmNzIyYTUzM2YxYWQxOWViMzRiMzY4OWJlOTVj
+    NjAxNTA1MzVhZDg1ODRiMmViNjJhYmY4OTZlZGVmZGIzMWUxODE=

data/Rakefile

@@ -31,14 +31,6 @@ and object models in SQL, Ruby and other languages.
 
   gem.email = "cjh@dataconstellation.com"
   gem.authors = ["Clifford Heath"]
-  gem.add_dependency "activefacts-api", "~>0.9.1"
-  gem.add_dependency "treetop"
-  gem.add_dependency "nokogiri"
-  gem.add_development_dependency "rspec", "~> 2.3.0"
-  gem.add_development_dependency "bundler", "~> 1.0.0"
-  gem.add_development_dependency "jeweler", "~> 1.5.2"
-  # gem.add_development_dependency "rcov", ">= 0"
-  gem.add_development_dependency "rdoc", ">= 2.4.2"
 
   # gem.changes              = paragraphs_of("History.txt", 0..1).join("\n\n")
   gem.extensions = ['lib/activefacts/cql/Rakefile']

data/examples/CQL/CompanyDirectorEmployee.cql

@@ -15,6 +15,15 @@ Company is identified by its Name where
 	Company is called Company Name;
 Company is listed;
 
+Employee is identified by its Nr;
+Employee works at one Company,
+	Company employs Employee;
+
+Manager is a kind of Employee;
+Employee is supervised by at most one Manager [acyclic],
+	Manager supervises Employee;
+Manager is ceo;
+
 Meeting is independent identified by Company and Date and Meeting is board meeting where
 	Meeting is held by one Company,
 	Company held Meeting,
@@ -37,14 +46,9 @@ Directorship is where
 	Company is directed by at least one Director;
 Directorship began on one appointment-Date;
 
-Employee is a kind of Person identified by its Nr;
-Employee works at one Company,
-	Company employs Employee;
-
-Manager is a kind of Employee;
-Employee is supervised by at most one Manager [acyclic],
-	Manager supervises Employee;
-Manager is ceo;
+Employment is where
+	Person works as Employee,
+	Employee role is assigned to at least one Person;
 
 /*
  * Constraints:

data/examples/CQL/Metamodel.cql

@@ -31,7 +31,7 @@ Rotation Setting is written as String restricted to {'left', 'right'};
 Scale is written as Unsigned Integer(32);
 Subscript is written as Unsigned Integer(16);
 Text is written as String(256);
-Transaction Timing is written as String restricted to {'assert', 'commit'};
+Transaction Phase is written as String restricted to {'assert', 'commit'};
 X is written as Signed Integer(32);
 Y is written as Signed Integer(32);
 
@@ -56,16 +56,18 @@ Concept is identified by Guid where
 	Concept has one Guid,
 	Guid is of at most one Concept;
 
-Constraint is a kind of Concept [partitioned];
+Constraint is identified by Concept where
+	Constraint is an instance of one Concept;
 Name is of Constraint,
 	Constraint is called at most one Name;
 
-Context Note is a kind of Concept [partitioned];
+Context Note is identified by Concept where
+	Context Note is an instance of one Concept;
 Context Note has one Context Note Kind,
 	Context Note Kind is of Context Note;
 Context Note has one Discussion,
 	Discussion is for Context Note;
-Context Note applies to at most one relevant-Concept [acyclic, stronglyintransitive],
+Context Note applies to at most one relevant-Concept,
 	Concept has Context Note;
 
 Enforcement is identified by Constraint where
@@ -75,15 +77,18 @@ Enforcement notifies at most one Agent;
 Enforcement has one Enforcement Code,
 	Enforcement Code is of Enforcement;
 
-Fact is a kind of Concept [partitioned];
+Fact is identified by Concept where
+	Fact is an instance of one Concept;
 
-Fact Type is a kind of Concept [partitioned];
+Fact Type is independent identified by Concept where
+	Fact Type is an instance of one Concept;
 Fact is of one Fact Type;
 
 Implication Rule is identified by its Name;
 Concept is implied by at most one Implication Rule;
 
-Instance is a kind of Concept [partitioned];
+Instance is identified by Concept where
+	Instance is an instance of one Concept;
 Instance objectifies at most one Fact,
 	Fact is objectified as at most one Instance;
 
@@ -99,7 +104,8 @@ Presence Constraint has at most one min-Frequency restricted to {2..};
 Presence Constraint is mandatory;
 Presence Constraint is preferred identifier;
 
-Query is a kind of Concept [partitioned];
+Query is identified by Concept where
+	Query is an instance of one Concept;
 
 Reading is identified by Fact Type and Ordinal where
 	Fact Type has Reading,
@@ -112,13 +118,14 @@ Reading is negative;
 Ring Constraint is a kind of Constraint;
 Ring Constraint is of one Ring Type;
 
-Role is a kind of Concept identified by Fact Type and Ordinal [partitioned] where
+Role is identified by Fact Type and Ordinal where
 	Role belongs to one Fact Type,
 	Fact Type contains Role,
 	Role fills one Ordinal,
 	Ordinal applies to Role;
 Ring Constraint has at most one other-Role,
 	other-Role is of Ring Constraint;
+Role is an instance of one Concept;
 Role is of Ring Constraint;  // Avoid ambiguity; this is a new fact type
 Role is of Ring Constraint,
 	Ring Constraint has at most one Role;
@@ -158,7 +165,8 @@ Subset Constraint is a kind of Set Constraint;
 Subset Constraint covers one subset-Role Sequence;
 Subset Constraint covers one superset-Role Sequence;
 
-Unit is a kind of Concept [partitioned];
+Unit is identified by Concept where
+	Unit is an instance of one Concept;
 Ephemera URL provides Unit coefficient,
 	Unit uses coefficient from at most one Ephemera URL;
 Name is of at most one Unit,
@@ -252,10 +260,11 @@ ORM Diagram is a kind of Diagram;
 Shape is in one ORM Diagram,
 	ORM Diagram includes Shape;
 
-Object Type is a kind of Concept identified by Vocabulary and Name [partitioned] where
+Object Type is identified by Vocabulary and Name where
 	Object Type belongs to one Vocabulary,
 	Object Type is called one Name;
 Instance is of one Object Type;
+Object Type is an instance of one Concept;
 Object Type uses at most one Pronoun;
 Object Type plays Role,
 	Role is played by one Object Type;
@@ -276,11 +285,12 @@ Play is where
 	Variable is restricted by Role,
 	Role controls Variable;
 
-Population is a kind of Concept identified by Vocabulary and Name [partitioned] where
+Population is identified by Vocabulary and Name where
 	Vocabulary includes Population,
 	Population belongs to at most one Vocabulary,
 	Population has one Name,
 	Name is of Population;
+Population is an instance of one Concept;
 Population includes Fact,
 	Fact belongs to one Population;
 Population includes Instance,
@@ -295,7 +305,7 @@ Reading Shape is for one Reading,
 	Reading has Reading Shape;
 
 Ring Constraint Shape is a kind of Constraint Shape;
-Ring Constraint Shape is attached to one Fact Type;
+Ring Constraint Shape is attached to one Fact Type Shape;
 
 Role Display is where
 	Fact Type Shape displays Role in Ordinal position,
@@ -372,7 +382,7 @@ Value Type has at most one Length,
 	Length is of Value Type;
 Value Type has at most one Scale,
 	Scale is of Value Type;
-Value Type is auto-assigned at at most one Transaction Timing;
+Value Type is auto-assigned at at most one Transaction Phase;
 Value Type is of at most one Unit;
 Value Type has at most one Value Constraint,
 	Value Constraint constrains at most one Value Type;
@@ -395,16 +405,16 @@ Implicit Boolean Value Type is a kind of Value Type;
  * Constraints:
  */
 for each Concept exactly one of these holds:
-	Concept is an Instance,
-	Concept is a Fact,
-	Concept is an Object Type,
-	Concept is a Role,
-	Concept is a Fact Type,
-	Concept is a Constraint,
-	Concept is a Population,
-	Concept is an Unit,
-	Concept is a Query,
-	Concept is a Context Note;
+	Object Type is an instance of Concept,
+	Fact Type is an instance of Concept,
+	Role is an instance of Concept,
+	Constraint is an instance of Concept,
+	Context Note is an instance of Concept,
+	Unit is an instance of Concept,
+	Instance is an instance of Concept,
+	Fact is an instance of Concept,
+	Population is an instance of Concept,
+	Query is an instance of Concept;
 for each Constraint exactly one of these holds:
 	Constraint is a Presence Constraint,
 	Constraint is a Set Constraint,
@@ -448,6 +458,12 @@ Step involves incidental Play
 Value Type has Scale
 	only if Value Type has Length;
 either Agreement was reached by Agent or Agreement was on Date;
+each Concept occurs at most one time in
+	Object Type is an instance of Concept;
+each Concept occurs at most one time in
+	Population is an instance of Concept;
+each Concept occurs at most one time in
+	Role is an instance of Concept;
 each combination Entity Type(1), Type Inheritance occurs at most one time in
 	Entity Type(1) is subtype of super Entity Type(2),
 	Type Inheritance provides identification;

data/examples/CQL/OilSupply.cql

@@ -19,11 +19,11 @@ Year Nr is written as Signed Integer(32);
 Month is identified by its Nr restricted to {1..12};
 Month is in one Season;
 
-Product is identified by its Name;
+Product is independent identified by its Name;
 
-Refinery is identified by its Name;
+Refinery is independent identified by its Name;
 
-Region is identified by its Name;
+Region is independent identified by its Name;
 
 Transport Route is where
 	Transport Method transportation is available from Refinery to Region,
@@ -32,7 +32,7 @@ Transport Route incurs at most one Cost per kl;
 
 Year is identified by its Nr;
 
-Acceptable Substitutes is where
+Acceptable Substitution is where
 	Product may be substituted by alternate-Product in Season [acyclic, intransitive],
 	alternate-Product is an acceptable substitute for Product in Season;
 
@@ -41,11 +41,13 @@ Supply Period is identified by Year and Month where
 	Supply Period is in one Month;
 
 Production Forecast is where
-	Refinery forecasts production of Product in Supply Period;
+	Refinery in Supply Period will make Product in one Quantity,
+	Refinery will make Product in Supply Period in Quantity,
+	Refinery will make Quantity of Product in Supply Period;
 Production Forecast predicts at most one Cost;
-Production Forecast is for one Quantity;
 
 Regional Demand is where
-	Region will need Product in Supply Period;
-Regional Demand is for at most one Quantity;
+	Region in Supply Period will need Product in one Quantity,
+	Region will need Product in Supply Period in Quantity,
+	Region will need Quantity of Product in Supply Period;
 

data/examples/CQL/unit.cql

@@ -124,16 +124,16 @@ vocabulary Units;
 1 atto converts to a;
 1 coul sec^-1 converts to ampere;
 0.0000000001 meter converts to angstrom;
-1 cd pi^-1 m^-2 converts to apostilb;
+1 cd m^-2 pi^-1 converts to apostilb;
 100.0 m^2 converts to are;
 0.00000000000000000000000000166044 kg converts to atomicmassunit approximately;
 149597871000.0 m converts to au approximately;
 94.0 lb converts to bag;
 0.0000000000000000000000000001 m^2 converts to barn;
 1 bit sec^-1 converts to baud;
-0.000000000066739 m^3 kg^-1 sec^-2 converts to bigG;
+0.000000000066739 kg^-1 m^3 sec^-2 converts to bigG;
 512.0 byte converts to block;
-1 cd pi^-1 m^-2 converts to blondel;
+1 cd m^-2 pi^-1 converts to blondel;
 1 centi converts to c;
 0.01 m^3 converts to cc;
 1.0/36 erlang converts to ccs;
@@ -150,7 +150,7 @@ vocabulary Units;
 1.0/16 oz converts to dram;
 0.0003 m^3 converts to drop;
 0.00000000000000000000000000000091095 kg converts to electronmass;
-100.0 cd pi^-1 m^-2 converts to equivalentphot;
+100.0 cd m^-2 pi^-1 converts to equivalentphot;
 1 femto converts to f;
 0.000000000000001 m converts to fermi;
 9.80665 m sec^-2 converts to g;
@@ -173,8 +173,8 @@ vocabulary Units;
 1 kilo converts to k;
 1 kg converts to key;
 1000.0 sec^-1 converts to khz;
-100.0 cd pi^-1 m^-2 converts to lambert;
-1 lb g converts to lbf;
+100.0 cd m^-2 pi^-1 converts to lambert;
+1 g lb converts to lbf;
 299792458.0 m sec^-1 converts to lightspeed approximately;
 1000.0 cc converts to liter;
 1 liter converts to litre;
@@ -183,7 +183,7 @@ vocabulary Units;
 1 megabyte converts to meg;
 133322.0 kg m^-2 sec^-2 converts to mercury;
 0.2 g converts to metriccarat;
-1 meter gram^-1 converts to metricyarncount;
+1 gram^-1 meter converts to metricyarncount;
 1000000.0 sec^-1 converts to mhz;
 60.0 sec converts to minute;
 0.001 liter converts to ml;
@@ -192,9 +192,9 @@ vocabulary Units;
 1 kg m sec^-2 converts to newton;
 1 newton converts to nt;
 1 pico converts to p;
-1 nt m^-2 converts to pascal;
-1000.0 nt m^-2 converts to pieze;
-100.0 kg m g sec converts to poncelet;
+1 m^-2 nt converts to pascal;
+1000.0 m^-2 nt converts to pieze;
+100.0 g kg m sec converts to poncelet;
 2.0 pi sec^-1 converts to pulsatance;
 10.0 m^2 nt^-1 sec^-1 converts to rhe;
 0.000258 curie kg^-1 converts to rontgen;
@@ -209,7 +209,7 @@ vocabulary Units;
 1000.0 nt converts to sthene;
 0.001 gram m converts to tex;
 1 circle converts to turn;
-1 gram g cc converts to water;
+1 cc g gram converts to water;
 1 yocto converts to y;
 1 zopto converts to z;
 1 hertz converts to Hz;
@@ -223,10 +223,10 @@ vocabulary Units;
 1.0/60 arcdeg converts to arcmin;
 1.0/60 arcmin converts to arcsec;
 1 au converts to astronomicalunit;
-101325.0 nt m^-2 converts to atmosphere;
-100000.0 nt m^-2 converts to bar;
-0.1 nt m^-2 converts to barie;
-0.1 nt m^-2 converts to barye;
+101325.0 m^-2 nt converts to atmosphere;
+100000.0 m^-2 nt converts to bar;
+0.1 m^-2 nt converts to barie;
+0.1 m^-2 nt converts to barye;
 0.000000000027027027027027 curie converts to becquerel;
 10.0 amp converts to biot;
 0.000000000001 m^2 newton^-1 converts to brewster;
@@ -246,39 +246,39 @@ vocabulary Units;
 1 gram converts to gm;
 1 grain converts to gr;
 1 mercury converts to hg;
-1 gm force sec^2 m^-1 converts to hyl;
+1 force gm m^-1 sec^2 converts to hyl;
 1 inch converts to in;
-1 nt m converts to joule;
+1 m nt converts to joule;
 1000.0 lbf converts to kip;
 1.0/12 in converts to line;
 1 cd sr converts to lumen;
-0.000000001 m hg s^-1 converts to lusec;
-1 cd sr m^-2 converts to lux;
+0.000000001 hg m s^-1 converts to lusec;
+1 cd m^-2 sr converts to lux;
 0.001 in converts to mil;
 1 minute converts to min;
 0.001 lux converts to nox;
-250.0 pi amp m^-1 converts to oersted;
+250.0 amp m^-1 pi converts to oersted;
 36.0 in converts to pace;
 3.0 in converts to palm;
-1 au radian arcsec^-1 converts to parsec;
+1 arcsec^-1 au radian converts to parsec;
 1 parsec converts to pc;
 100.0 lumen m^-2 converts to phot;
 1.0/6 in converts to pica;
 0.0000000000000000000000000000000006626 joule sec converts to planck;
 1.0/72 in converts to point;
 100.0 gm m^-1 sec^-1 converts to poise;
-1 lb g in^-2 converts to psi;
+1 g in^-2 lb converts to psi;
 9.0 in converts to quarter;
 1 turn converts to rev;
 1 turn converts to revolution;
-1 rev minute^-1 converts to rpm;
+1 minute^-1 rev converts to rpm;
 1 rev sec^-1 converts to rps;
 9.0 in converts to span;
 4.0 pi sr converts to spat;
 0.000000000333564095198152 amp converts to statamp;
 1 statamp converts to statampere;
 1000000.0 gm converts to tonne;
-0.001 m hg converts to torr;
+0.001 hg m converts to torr;
 1 appound converts to troypound;
 1 joule sec^-1 converts to watt;
 1 atmosphere converts to atm;
@@ -293,16 +293,16 @@ vocabulary Units;
 4.1868 joule converts to cal;
 0.01 in converts to caliber;
 1 cal converts to calorie;
-1.0/4 pi in^2 converts to circularinch;
-0.00000025 pi in^2 converts to circularmil;
-0.00000000001 m hg s^-1 converts to clusec;
+1.0/4 in^2 pi converts to circularinch;
+0.00000025 in^2 pi converts to circularmil;
+0.00000000001 hg m s^-1 converts to clusec;
 37.5 brgallon converts to cran;
 0.0906 gm converts to crith;
 18.0 in converts to cubit;
-0.01 m gm sec^-2 converts to dyne;
+0.01 gm m sec^-2 converts to dyne;
 45.0 in converts to ell;
-1 lumen pi^-1 m^-2 converts to equivalentlux;
-0.01 m^2 gm sec^-2 converts to erg;
+1 lumen m^-2 pi^-1 converts to equivalentlux;
+0.01 gm m^2 sec^-2 converts to erg;
 7.0/8 in converts to finger;
 12.0 in converts to foot/feet;
 1000.0 cal converts to frigorie;
@@ -310,37 +310,37 @@ vocabulary Units;
 231.0 in^3 converts to gallon;
 4.0 in converts to hand;
 0.0000000000000000000000000000000001055 joule sec converts to hbar;
-550.0 ft lb g sec^-1 converts to horsepower;
+550.0 ft g lb sec^-1 converts to horsepower;
 60.0 min converts to hour;
 1 horsepower converts to hp;
 1 hour converts to hr;
-1 nmile hr^-1 converts to knot;
+1 hr^-1 nmile converts to knot;
 100.0 cal m^-2 converts to langley;
 900.0 ft pound^-1 converts to linenyarncount;
 33.0/50 ft converts to link;
 5280.0 ft converts to mile;
 2.5 foot converts to militarypace;
 1.5 ft^3 min^-1 converts to minersinch;
-1 mile hr^-1 converts to mph;
+1 hr^-1 mile converts to mph;
 1 oersted converts to oe;
 1 ft lb sec^-2 converts to poundal;
 100.0 erg gm^-1 converts to rad;
-12000.0 btu ton^-1 hour^-1 converts to refrigeration;
+12000.0 btu hour^-1 ton^-1 converts to refrigeration;
 100.0 ft^3 converts to registerton;
 20.0 ft converts to rope;
 1 ft^2 converts to sabin;
 40.0 ft^3 converts to shippington;
 23.934469444 hour converts to siderealday;
 1.0/24 siderealday converts to siderealhour;
-1 lb g sec^2 ft^-1 converts to slug;
+1 ft^-1 g lb sec^2 converts to slug;
 100.0 ft^2 converts to square;
 66.0 ft converts to surveyorschain;
 33.0/50 ft converts to surveyorslink;
 100000.0 btu converts to therm;
 1000000.0 cal converts to thermie;
 1 ft^3 converts to timberfoot;
-1 watt amp^-1 converts to volt;
-1 volt sec converts to weber;
+1 amp^-1 watt converts to volt;
+1 sec volt converts to weber;
 1680.0 ft pound^-1 converts to worstedyarncount;
 3.0 ft converts to yard;
 1 yard converts to yd;
@@ -349,10 +349,10 @@ vocabulary Units;
 6080.0 ft hr^-1 converts to admiraltyknot;
 191.835 ft converts to arpentlin;
 1000000000.0 e volt converts to bev;
-0.00000000011125945705385 hbar^2 C^2 N^-1 m^-2 e^-2 electronmass^-1 converts to bohrradius;
+0.00000000011125945705385 C^2 N^-1 e^-2 electronmass^-1 hbar^2 m^-2 converts to bohrradius;
 40.0 yd converts to bolt;
 4.0 brpeck converts to brbushel;
-1200.0/3937 m ft^-1 converts to british;
+1200.0/3937 ft^-1 m converts to british;
 1.0/2 brquart converts to brpint;
 720.0 ft converts to cable;
 1 ft^3 sec^-1 converts to cfs;
@@ -362,37 +362,37 @@ vocabulary Units;
 2520.0 ft pound^-1 converts to cottonyarncount;
 24.0 hr converts to day;
 35.0 ft^3 converts to displacementton;
-268.8025 in^3 gallon^-1 converts to dry approximately;
-1 e V converts to eV;
+268.8025 gallon^-1 in^3 converts to dry approximately;
+1 V e converts to eV;
 1 e volt converts to electronvolt;
 100.0 ft converts to engineerschain;
 1 ft converts to engineerslink;
-1 lumen pi^-1 ft^-2 converts to equivalentfootcandle;
+1 ft^-2 lumen pi^-1 converts to equivalentfootcandle;
 1 e volt converts to ev;
 1 coul volt^-1 converts to farad;
 6.0 ft converts to fathom;
-1 lumen ft^-2 converts to footcandle;
-1 cd pi^-1 ft^-2 converts to footlambert;
+1 ft^-2 lumen converts to footcandle;
+1 cd ft^-2 pi^-1 converts to footlambert;
 14.0 day converts to fortnight;
 16.0/15 ft converts to frenchfoot;
 220.0 yd converts to furlong;
 1 gallon converts to gal;
-0.000000001 weber m^-2 converts to gamma;
-0.0001 weber m^-2 converts to gauss;
+0.000000001 m^-2 weber converts to gamma;
+0.0001 m^-2 weber converts to gauss;
 1 british ft converts to geodeticfoot;
 22.0 yd converts to gunterschain;
-1 sec^2 farad^-1 converts to henry;
+1 farad^-1 sec^2 converts to henry;
 4.0/5 gal converts to jeroboam;
 18.0 gal converts to kilderkin;
 29.5305555 day converts to lunarmonth;
 12.0 lunarmonth converts to lunaryear;
 0.00000001 weber converts to maxwell;
-1000000.0 gal day^-1 converts to mgd;
+1000000.0 day^-1 gal converts to mgd;
 0.001 henry converts to mh;
 1 mile converts to mi;
-1 mile gal^-1 converts to mpg;
+1 gal^-1 mile converts to mpg;
 1.0/16 yd converts to nail;
-1 volt amp^-1 converts to ohm;
+1 amp^-1 volt converts to ohm;
 3.5 mi converts to parasang;
 1 poundal converts to pdl;
 0.000000000001 farad converts to pf;
@@ -411,7 +411,7 @@ vocabulary Units;
 1 british ft converts to surveyfoot;
 3.0 surveyfoot converts to surveyyard;
 1 lunarmonth converts to synodicmonth;
-1 weber m^-2 converts to tesla;
+1 m^-2 weber converts to tesla;
 36.0 mi^2 converts to township;
 7.0 day converts to week;
 365.24219879 day converts to year approximately;
@@ -471,3 +471,4 @@ vocabulary Units;
 1 tablespoon converts to tbsp;
 4.0/3 fldr converts to teaspoon;
 1 teaspoon converts to tsp;
+