Changeset 7346

Timestamp:

Apr 27, 2017, 8:56:19 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2080: Add Molar concentration (=Molarity) as a quantity

Location:

trunk

Files:

• data/units.xml (modified) (1 diff)
• src/core/net/sf/basedb/core/Quantity.java (modified) (1 diff)

trunk/data/units.xml

@@ -1232 +1232 @@
   </quantity>
 
+  <quantity system-id="net.sf.basedb.core.Quantity.MOLAR_CONCENTRATION">
+    <name>Molar concentration</name>
+    <reference-unit>1 M</reference-unit>
+    <description>
+      Molar concentration is defined as the amount of substance (in moles) per liter.
+      See https://en.wikipedia.org/wiki/Molar_concentration
+    </description>
+    <unit>
+      <name>Molar</name>
+      <symbol>M</symbol>
+      <factor>1</factor>
+      <description>1 molar is the references unit of molar concentration</description>
+    </unit>
+    <unit>
+      <name>Millimolar</name>
+      <symbol>mM</symbol>
+      <factor>0.001</factor>
+      <description>1 millimolar is 1/1 000 molar.</description>
+    </unit>
+    <unit>
+      <name>Micromolar</name>
+      <symbol>µM</symbol>
+      <alias>uM</alias>
+      <factor>1E-6</factor>
+      <description>1 micromolar is 1/1 000 millimolar.</description>
+    </unit>
+    <unit>
+      <name>Nanomolar</name>
+      <symbol>nM</symbol>
+      <factor>1E-9</factor>
+      <description>1 nanomolar is 1/1 000 micromolar.</description>
+    </unit>
+    <unit>
+      <name>Picomolar</name>
+      <symbol>pM</symbol>
+      <factor>1E-12</factor>
+      <description>1 picomolar is 1/1 000 nanomolar.</description>
+    </unit>
+  </quantity>
+
 <!-- 
   <quantity system-id="">

trunk/src/core/net/sf/basedb/core/Quantity.java

@@ -246 +246 @@
   public static final String STORAGE_SIZE = "net.sf.basedb.core.Quantity.STORAGE_SIZE";
   
+  /**
+    The id for the <code>Quantity</code> object representing substance concentration.
+    @see "https://en.wikipedia.org/wiki/Molar_concentration"
+    @since 3.11
+  */
+  public static final String MOLAR_CONCENTRATION = "net.sf.basedb.core.Quantity.MOLAR_CONCENTRATION";
+
   /**
     Create a new <code>Quantity</code> item.