Difference between revisions of "MediaWiki:Gadget-calculator-drugs-core.js"

Revision as of 21:51, 11 August 2021

/**
 * @author Chris Rishel
 */
( function() {
    var DEFAULT_DRUG_COLOR = 'default';
    var DEFAULT_DRUG_POPULATION = 'general';

    mw.calculators.isValueDependent = function( value, variableId ) {
        // This may need generalized to support other variables in the future
        if( variableId === 'weight' ) {
            return value && value.formatUnits().match( /\/[\s(]*?kg/ );
        } else {
            throw new Error( 'Dependence "' + variableId + '" not supported by isValueDependent' );
        }
    };

    /**
     * Define units
     */
    mw.calculators.addUnitsBases( {
        concentration: {
            toString: function( units ) {
                units = units.replace( ' pct', '%' );

                return units;
            }
        }
    } );

    mw.calculators.addUnits( {
        pct: {
            baseName: 'concentration',
            definition: '10 mg/mL'
        },
        vial: {
            baseName: 'VOLUME'
        }
    } );



    /**
     * DrugColor
     */
    mw.calculators.drugColors = {};

    mw.calculators.addDrugColors = function( drugColorData ) {
        var drugColors = mw.calculators.createCalculatorObjects( 'DrugColor', drugColorData );

        for( var drugColorId in drugColors ) {
            mw.calculators.drugColors[ drugColorId ] = drugColors[ drugColorId ];
        }
    };

    mw.calculators.getDrugColor = function( drugColorId ) {
        if( mw.calculators.drugColors.hasOwnProperty( drugColorId ) ) {
            return mw.calculators.drugColors[ drugColorId ];
        } else {
            return null;
        }
    };

    /**
     * Class DrugColor
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugColor}
     * @constructor
     */
    mw.calculators.objectClasses.DrugColor = function( propertyValues ) {
        var properties = {
            required: [
                'id'
            ],
            optional: [
                'parentColor',
                'primaryColor',
                'highlightColor',
                'striped'
            ]
        };

        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );

        this.parentColor = this.parentColor || this.id === DEFAULT_DRUG_COLOR ? this.parentColor : DEFAULT_DRUG_COLOR;
    };

    mw.calculators.objectClasses.DrugColor.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugColor.prototype.getParentDrugColor = function() {
        if( !this.parentColor ) {
            return null;
        }

        var parentDrugColor = mw.calculators.getDrugColor( this.parentColor );

        if( !parentDrugColor ) {
            throw new Error( 'Parent drug color "' + this.parentColor + '" not found for drug color "' + this.id + '"' );
        }

        return parentDrugColor;
    };

    mw.calculators.objectClasses.DrugColor.prototype.getHighlightColor = function() {
        if( this.highlightColor ) {
            return this.highlightColor;
        } else if( this.parentColor ) {
            return this.getParentDrugColor().getHighlightColor();
        }
    };

    mw.calculators.objectClasses.DrugColor.prototype.getPrimaryColor = function() {
        if( this.primaryColor ) {
            return this.primaryColor;
        } else if( this.parentColor ) {
            return this.getParentDrugColor().getPrimaryColor();
        }
    };

    mw.calculators.objectClasses.DrugColor.prototype.isStriped = function() {
        if( this.striped !== null ) {
            return this.striped;
        } else if( this.parentColor ) {
            return this.getParentDrugColor().isStriped();
        }
    };





    /**
     * DrugPopulation
     */

    mw.calculators.drugPopulations = {};

    mw.calculators.addDrugPopulations = function( drugPopulationData ) {
        var drugPopulations = mw.calculators.createCalculatorObjects( 'DrugPopulation', drugPopulationData );

        for( var drugPopulationId in drugPopulations ) {
            mw.calculators.drugPopulations[ drugPopulationId ] = drugPopulations[ drugPopulationId ];
        }
    };

    mw.calculators.getDrugPopulation = function( drugPopulationId ) {
        if( mw.calculators.drugPopulations.hasOwnProperty( drugPopulationId ) ) {
            return mw.calculators.drugPopulations[ drugPopulationId ];
        } else {
            return null;
        }
    };



    /**
     * Class DrugPopulation
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugPopulation}
     * @constructor
     */
    mw.calculators.objectClasses.DrugPopulation = function( propertyValues ) {
        var properties = {
            required: [
                'id',
                'name'
            ],
            optional: [
                'abbreviation',
                'variables'
            ]
        };

        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );

        if( this.variables ) {
            for( var variableId in this.variables ) {
                if( !mw.calculators.getVariable( variableId ) ) {
                    throw new Error( 'DrugPopulation variable "' + variableId + '" not defined' );
                }

                this.variables[ variableId ].min = this.variables[ variableId ].hasOwnProperty( 'min' ) ?
                    math.unit( this.variables[ variableId ].min ) : null;

                this.variables[ variableId ].max = this.variables[ variableId ].hasOwnProperty( 'max' ) ?
                    math.unit( this.variables[ variableId ].max ) : null;
            }
        } else {
            this.variables = {};
        }
    };

    mw.calculators.objectClasses.DrugPopulation.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugPopulation.prototype.getCalculationData = function() {
        var inputData = new mw.calculators.objectClasses.CalculationData();

        for( var variableId in this.variables ) {
            inputData.variables.required.push( variableId );
        }

        return inputData;
    };

    mw.calculators.objectClasses.DrugPopulation.prototype.getCalculationDataScore = function( dataValues ) {
        // A return value of -1 indicates the data did not match the population definition

        for( var variableId in this.variables ) {
            if( !dataValues.hasOwnProperty( variableId ) ) {
                return -1;
            }

            if( this.variables[ variableId ].min &&
                !math.largerEq( dataValues[ variableId ], this.variables[ variableId ].min ) ) {
                return -1;
            }

            if( this.variables[ variableId ].max &&
                !math.smallerEq( dataValues[ variableId ], this.variables[ variableId ].max ) ) {
                return -1;
            }
        }

        // If the data matches the population definition, the score corresponds to the number of variables in the
        // population definition. This should roughly correspond to the specificity of the population.
        return Object.keys( this.variables ).length;
    };

    mw.calculators.objectClasses.DrugPopulation.prototype.toString = function() {
        return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
    }





    /**
     * DrugIndication
     */
    mw.calculators.drugIndications = {};

    mw.calculators.addDrugIndications = function( drugIndicationData ) {
        var drugIndications = mw.calculators.createCalculatorObjects( 'DrugIndication', drugIndicationData );

        for( var drugIndicationId in drugIndications ) {
            mw.calculators.drugIndications[ drugIndicationId ] = drugIndications[ drugIndicationId ];
        }
    };

    mw.calculators.getDrugIndication = function( drugIndicationId ) {
        if( mw.calculators.drugIndications.hasOwnProperty( drugIndicationId ) ) {
            return mw.calculators.drugIndications[ drugIndicationId ];
        } else {
            return null;
        }
    };



    /**
     * Class DrugIndication
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugIndication}
     * @constructor
     */
    mw.calculators.objectClasses.DrugIndication = function( propertyValues ) {
        var properties = {
            required: [
                'id',
                'name'
            ],
            optional: [
                'abbreviation'
            ]
        };

        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
    };

    mw.calculators.objectClasses.DrugIndication.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugIndication.prototype.toString = function() {
        return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
    };





    /**
     * Drug
     */
    mw.calculators.drugs = {};

    mw.calculators.addDrugs = function( drugData ) {
        var drugs = mw.calculators.createCalculatorObjects( 'Drug', drugData );

        for( var drugId in drugs ) {
            mw.calculators.drugs[ drugId ] = drugs[ drugId ];
        }
    };

    mw.calculators.addDrugDosages = function( drugId, drugDosageData ) {
        var drug = mw.calculators.getDrug( drugId );

        if( !drug ) {
            throw new Error( 'DrugDosage references drug "' + drugId + '" which is not defined' );
        }

        drug.addDosages( drugDosageData );

        var calculationId = 'drugDosage-' + drugId;
        var calculation = mw.calculators.getCalculation( calculationId );

        if( !calculation ) {
            var calculationData = {};

            calculationData[ calculationId ] = {
                calculate: mw.calculators.objectClasses.DrugDosageCalculation.prototype.calculate,
                drug: drugId,
                type: 'drug'
            };

            mw.calculators.addCalculations( calculationData, 'DrugDosageCalculation' );

            calculation = mw.calculators.getCalculation( calculationId );
        }

        calculation.setDependencies();
    };

    mw.calculators.getDrug = function( drugId ) {
        if( mw.calculators.drugs.hasOwnProperty( drugId ) ) {
            return mw.calculators.drugs[ drugId ];
        } else {
            return null;
        }
    };



    /**
     * Class Drug
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.Drug}
     * @constructor
     */
    mw.calculators.objectClasses.Drug = function( propertyValues ) {
        var properties = {
            required: [
                'id',
                'name'
            ],
            optional: [
                'color'
            ]
        };

        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );

        if( !this.color ) {
            this.color = DEFAULT_DRUG_COLOR;
        }

        var color = mw.calculators.getDrugColor( this.color );

        if( !color ) {
            throw new Error( 'Invalid drug color "' + this.color + '" for drug "' + this.id + '"' );
        }

        this.color = color;

        this.dosages = [];
        this.preparations = [];
    };

    mw.calculators.objectClasses.Drug.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.Drug.prototype.addDosages = function( drugDosageData ) {
        var dosages = mw.calculators.createCalculatorObjects( 'DrugDosage', drugDosageData );

        for( var dosageId in dosages ) {
            dosages[ dosageId ].id = this.dosages.length;

            this.dosages.push( dosages[ dosageId ] );
        }
    };

    mw.calculators.objectClasses.Drug.prototype.getIndications = function() {
        var indications = [];

        for( var iDosage in this.dosages ) {
            if( this.dosages[ iDosage ].indication ) {
                indications.push( this.dosages[ iDosage ].indication );
            }
        }

        return indications.filter( mw.calculators.uniqueValues );
    };

    mw.calculators.objectClasses.Drug.prototype.getPopulations = function( indicationId ) {
        var populations = [];

        for( var iDosage in this.dosages ) {
            if( this.dosages[ iDosage ].population &&
                ( !indicationId || ( this.dosages[ iDosage ].indication && this.dosages[ iDosage ].indication.id === indicationId ) ) ) {
                populations.push( this.dosages[ iDosage ].population );
            }
        }

        return populations.filter( mw.calculators.uniqueValues );
    };

    mw.calculators.objectClasses.Drug.prototype.getPreparations = function() {
        return this.preparations.filter( mw.calculators.uniqueValues );
    };





    /**
     * DrugPreparation
     */
    mw.calculators.addDrugPreparations = function( drugId, drugPreparationData ) {
        if( !mw.calculators.getDrug( drugId ) ) {
            throw new Error( 'DrugPreparation references drug "' + drugId + '" which is not defined' );
        }

        for( var drugPreparationId in drugPreparationData ) {
            drugPreparationData[ drugPreparationId ].drug = drugId;
        }

        var drugPreparations = mw.calculators.createCalculatorObjects( 'DrugPreparation', drugPreparationData );

        for( var drugPreparationId in drugPreparations ) {
            mw.calculators.drugs[ drugId ].preparations[ drugPreparationId ] = drugPreparations[ drugPreparationId ];
        }
    };



    /**
     * Class DrugPreparation
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugPreparation}
     * @constructor
     */
    mw.calculators.objectClasses.DrugPreparation = function( propertyValues ) {
        var properties = {
            required: [
                'drug',
                'id',
                'concentration'
            ],
            optional: [
                'dilutionRequired',
                'commonDilution'
            ]
        };

        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );


        this.concentration = this.concentration.replace( 'mcg', 'ug' );

        this.concentration = math.unit( this.concentration );
    };

    mw.calculators.objectClasses.DrugPreparation.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugPreparation.prototype.getVolumeUnits = function() {
        // The units of concentration will always be of the form "mass / volume"
        // The regular expression matches all text leading up to the volume units
        return this.concentration.formatUnits().replace( /.*\/\s?/, '' );
    };

    mw.calculators.objectClasses.DrugPreparation.prototype.toString = function() {
        return mw.calculators.getValueString( this.concentration );
    };





    /**
     * Class DrugDosage
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugDosage}
     * @constructor
     */
    mw.calculators.objectClasses.DrugDosage = function( propertyValues ) {
        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );

        var drugIndication = mw.calculators.getDrugIndication( this.indication );

        if( !drugIndication ) {
            throw new Error( 'Invalid indication "' + this.indication + '" for drug dosage' );
        }

        this.indication = drugIndication;

        this.population = this.population ? this.population : DEFAULT_DRUG_POPULATION;

        var drugPopulation = mw.calculators.getDrugPopulation( this.population );

        if( !drugPopulation ) {
            throw new Error( 'Invalid population "' + this.population + '" for drug dosage' );
        }

        this.population = drugPopulation;

        this.route = this.route ? this.route : 'IV';

        var drugDoseData = this.dose;
        this.dose = [];

        this.addDoses( drugDoseData );
    };

    mw.calculators.objectClasses.DrugDosage.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugDosage.prototype.addDoses = function( drugDoseData ) {
        // Each dosage can have one or more associated doses. Ensure this value is an array.
        if( !Array.isArray( drugDoseData ) ) {
            drugDoseData = [ drugDoseData ];
        }

        var doses = mw.calculators.createCalculatorObjects( 'DrugDose', drugDoseData );

        for( var doseId in doses ) {
            doses[ doseId ].id = this.dose.length;

            this.dose.push( doses[ doseId ] );
        }
    };

    mw.calculators.objectClasses.DrugDosage.prototype.getCalculationData = function() {
        var inputData = new mw.calculators.objectClasses.CalculationData();

        inputData = inputData.merge( this.population.getCalculationData() );

        for( var iDose in this.dose ) {
            inputData = inputData.merge( this.dose[ iDose ].getCalculationData() );
        }

        return inputData;
    };

    mw.calculators.objectClasses.DrugDosage.prototype.getProperties = function() {
        return {
            required: [
                'dose',
                'id',
                'indication'
            ],
            optional: [
                'description',
                'population',
                'route'
            ]
        };
    }





    /**
     * Class DrugDose
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugDose}
     * @constructor
     */
    mw.calculators.objectClasses.DrugDose = function( propertyValues ) {
        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );

        var mathProperties = this.getMathProperties();

        for( var iMathProperty in mathProperties ) {
            var mathProperty = mathProperties[ iMathProperty ];

            if( this[ mathProperty ] ) {
                // TODO consider making a UnitsBase.weight.fromString()
                this[ mathProperty ] = this[ mathProperty ].replace( 'kg', 'kgwt' );
                this[ mathProperty ] = this[ mathProperty ].replace( 'mcg', 'ug' );

                this[ mathProperty ] = math.unit( this[ mathProperty ] );
            } else {
                this[ mathProperty ] = null;
            }
        }

        if( this.weightCalculation ) {
            var weightCalculation = mw.calculators.getCalculation( this.weightCalculation );

            if( !weightCalculation ) {
                throw new Error( 'Drug dose references weight calculation "' + this.weightCalculation + '" which is not defined' );
            }

            this.weightCalculation = weightCalculation;
        }
    };

    mw.calculators.objectClasses.DrugDose.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );

    mw.calculators.objectClasses.DrugDose.prototype.getCalculationData = function() {
        var calculationData = new mw.calculators.objectClasses.CalculationData();

        var mathProperties = this.getMathProperties();

        // Look at dose properties to identify any variable dependence (e.g. weight-dependence)
        for( var iMathProperty in mathProperties ) {
            var mathProperty = mathProperties[ iMathProperty ];

            var dosePropertyValue = this[ mathProperty ];

            // For now, this only supports weight dependence, unclear if it will need to be more generalizable in the future
            if( mw.calculators.isValueDependent( dosePropertyValue, 'weight' ) &&
                calculationData.variables.optional.indexOf( 'weight' ) === -1 ) {
                calculationData.variables.optional.push( 'weight' );
            }
        }

        if( this.weightCalculation ) {
            calculationData.calculations.optional.push( this.weightCalculation.id );
        }

        return calculationData;
    };

    mw.calculators.objectClasses.DrugDose.prototype.getMathProperties = function() {
        return [
            'dose',
            'min',
            'max',
            'absoluteMin',
            'absoluteMax'
        ];
    };

    mw.calculators.objectClasses.DrugDose.prototype.getProperties = function() {
        return {
            required: [
                'id'
            ],
            optional: [
                'absoluteMin',
                'absoluteMax',
                'dose',
                'frequency',
                'min',
                'max',
                'name',
                'weightCalculation'
            ]
        };
    };




    /**
     * Class DrugDosageCalculation
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugDosageCalculation}
     * @constructor
     */
    mw.calculators.objectClasses.DrugDosageCalculation = function( propertyValues ) {
        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );

        this.initialize();
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculation.prototype );

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.calculate = function( data ) {
        var value = {
            population: null,
            preparation: data.preparation,
            dose: []
        };

        // Determine which dosage to use
        var populationScores = [];

        for( var iDosage in data.drug.dosages ) {
            var drugDosage = data.drug.dosages[ iDosage ];

            // If the indication does not match, set the score to -1
            var populationScore = ( drugDosage.indication.id === data.indication.id ) ?
                drugDosage.population.getCalculationDataScore( data ) : -1;

            populationScores.push( populationScore );
        }

        var maxPopulationScore = Math.max.apply( null, populationScores );

        if( maxPopulationScore < 0 ) {
            return value;
        }

        // If there is more than one dosage with the same score, take the first.
        // This allows the data editor to decide which is most important.
        var dosageId = populationScores.indexOf( maxPopulationScore );

        var dosage = data.drug.dosages[ dosageId ];

        value.population = dosage.population;

        // A dosage may contain multiple doses (e.g. induction and maintenance)
        for( var iDose in dosage.dose ) {
            var dose = dosage.dose[ iDose ];
            var mathProperties = dose.getMathProperties();

            // Initialize value properties for dose
            value.dose[ iDose ] = {
                massPerWeight: {
                    decimals: 0
                },
                mass: {
                    decimals: 0
                },
                name: dose.name,
                volume: {
                    decimals: 0
                },
                weightCalculation: dose.weightCalculation ? dose.weightCalculation : null
            };

            var weightValue = dose.weightCalculation ? dose.weightCalculation.value : data.weight;

            for( var iMathProperty in mathProperties ) {
                var mathProperty = mathProperties[ iMathProperty ];

                var doseValue = dose[ mathProperty ];

                if( doseValue ) {
                    var doseValueDecimals = mw.calculators.getValueDecimals( doseValue );

                    if( mw.calculators.isValueDependent( doseValue, 'weight' ) ) {
                        value.dose[ iDose ].massPerWeight[ mathProperty ] = doseValue;

                        // Set the decimals based upon the specified dose
                        value.dose[ iDose ].massPerWeight.decimals = math.max(
                            doseValueDecimals,
                            value.dose[ iDose ].massPerWeight.decimals
                        );

                        // For whatever reason math.format will simplify the units, but math.formatUnits will not
                        // as a hack, we recreate a new unit value with the correct formatting of the result
                        value.dose[ iDose ].mass[ mathProperty ] = weightValue ? math.unit( math.multiply( doseValue, weightValue ).format() ) : null;

                        // Mass should use one fewer decimals than massPerWeight (unless already 0)
                        value.dose[ iDose ].mass.decimals = math.max(
                            math.max( doseValueDecimals - 1, 0 ),
                            value.dose[ iDose ].mass.decimals
                        );
                    } else {
                        value.dose[ iDose ].mass[ mathProperty ] = doseValue;

                        // Set the decimals based upon the specified dose
                        value.dose[ iDose ].mass.decimals = math.max(
                            doseValueDecimals,
                            value.dose[ iDose ].mass.decimals
                        );
                    }

                    if( data.preparation && value.dose[ iDose ].mass[ mathProperty ] ) {
                        // Same hack as above to get units to simplify correctly
                        value.dose[ iDose ].volume[ mathProperty ] = math.unit( math.multiply( value.dose[ iDose ].mass[ mathProperty ], math.divide( 1, data.preparation.concentration ) ).format() );

                        // value.dose[ iDose ].volume.decimals = 0;
                    }
                }
            }
        }

        return value;
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.doRender = function() {
        var $calculationContainer = $( '.' + this.getContainerClass() );

        if( !$calculationContainer.length ) {
            return;
        }

        $calculationContainer.empty();

        // Label column
        var labelAttributes = {};
        var labelCss = {};

        if( this.drug.color.isStriped() ) {
            labelCss[ 'background' ] = 'repeating-linear-gradient(135deg,rgba(0,0,0,0),rgba(0,0,0,0)10px,rgba(255,255,255,1)10px,rgba(255,255,255,1)20px),' + this.drug.color.getPrimaryColor();
        } else {
            labelCss[ 'background-color'] = this.drug.color.getPrimaryColor();
        }

        var $label = $( '<th>', labelAttributes ).css( labelCss );

        $label.append( this.getLabelHtml() );

        var $infoButton = null;

        if( this.hasInfo() ) {
            $infoButton = $( '<a>', {
                'data-toggle': 'collapse',
                href: '#' + this.getContainerClass() + '-info',
                role: 'button',
                'aria-expanded': 'false',
                'aria-controls': this.getContainerClass() + '-info'
            } )
                .append( $( '<i>', {
                    class: 'far fa-question-circle'
                } ) );

            $label
                .append( $( '<span>', {
                    class: 'calculator-calculation-column-label-info'
                } )
                    .append( $infoButton )
                );
        }

        // Indication column
        var $indication = $( '<td>' );

        var indications = this.drug.getIndications();

        if( indications.length > 1 ) {
            $indication.append( mw.calculators.getVariable( this.getVariableIds().indication  ).createInput({
                hideLabel: true
            } ) );
        } else {
            $indication.append( String( indications[ 0 ] ) );
        }

        // Dosage column
        var $dosage = $( '<td>' );

        var dash = '&ndash;';

        var preparations = this.drug.getPreparations();
        var $preparationSelect;

        if( preparations.length > 1 ) {
            $preparationSelect = mw.calculators.getVariable( this.getVariableIds().preparation  ).createInput({
                hideLabel: true,
                inline: true,
                inputClass: 'calculator-input-preparation'
            } );
        } else {
            $preparationSelect = String( preparations[ 0 ] );
        }

        if( this.value.population && this.value.population.id !== DEFAULT_DRUG_POPULATION ) {
            $dosage.append( String( this.value.population ) + '<br />' );
        }

        for( var iDose in this.value.dose ) {
            var doseValue = this.value.dose[ iDose ];

            if( doseValue.name ) {
                $dosage.append( doseValue.name + '<br />' );
            }

            var massPerWeightHtml = '';

            if( doseValue.massPerWeight.hasOwnProperty( 'dose' ) ) {
                massPerWeightHtml += mw.calculators.getValueString( doseValue.massPerWeight.dose, doseValue.massPerWeight.decimals );
            } else if( doseValue.massPerWeight.hasOwnProperty( 'min' ) &&
                doseValue.massPerWeight.hasOwnProperty( 'max' ) ) {
                massPerWeightHtml += mw.calculators.getValueNumber( doseValue.massPerWeight.min, doseValue.massPerWeight.decimals );
                massPerWeightHtml += dash;
                massPerWeightHtml += mw.calculators.getValueString( doseValue.massPerWeight.max, doseValue.massPerWeight.decimals );
            }

            if( massPerWeightHtml ) {
                if( doseValue.weightCalculation ) {
                    massPerWeightHtml += ' (' + doseValue.weightCalculation.getLabelString() + ')';
                }

                $dosage.append( massPerWeightHtml + '<br />' );
            }

            var massHtml = '';
            var massUnits = '';

            if( doseValue.mass.hasOwnProperty( 'dose' ) ) {
                massHtml += mw.calculators.getValueString( doseValue.mass.dose, doseValue.mass.decimals );

                massUnits = mw.calculators.getUnitsString( doseValue.mass.dose );
            } else if( doseValue.mass.hasOwnProperty( 'min' ) &&
                doseValue.mass.hasOwnProperty( 'max' ) ) {
                massHtml += mw.calculators.getValueNumber( doseValue.mass.min, doseValue.mass.decimals );
                massHtml += dash;
                massHtml += mw.calculators.getValueString( doseValue.mass.max, doseValue.mass.decimals );

                massUnits = mw.calculators.getUnitsString( doseValue.mass.min );
            }

            if( massHtml ) {
                $dosage.append( massHtml + '<br />' );
            }

            var volumeHtml = '';

            if( this.value.preparation ) {
                // Get the volume units of the preparation
                var volumeUnits = this.value.preparation.getVolumeUnits();

                if( !$.isEmptyObject( doseValue.mass ) && massUnits ) {
                    // Extract any remaining additional dependent units (e.g. /min)
                    var massRemainderUnits = massUnits.replace( /.*\/?/, '' );

                    if( massRemainderUnits ) {
                        volumeUnits = volumeUnits + '/' + massRemainderUnits;
                    }
                }

                if( doseValue.volume.hasOwnProperty( 'dose' ) ) {
                    volumeHtml += mw.calculators.getValueString( doseValue.volume.dose.to( volumeUnits ), doseValue.volume.decimals );
                } else if( doseValue.volume.hasOwnProperty( 'min' ) &&
                    doseValue.volume.hasOwnProperty( 'max' ) ) {
                    volumeHtml += mw.calculators.getValueNumber( doseValue.volume.min.to( volumeUnits ), doseValue.volume.decimals );
                    volumeHtml += dash;
                    volumeHtml += mw.calculators.getValueString( doseValue.volume.max.to( volumeUnits ), doseValue.volume.decimals );
                }

                if( volumeHtml ) {
                    $dosage.append( volumeHtml + ' of ' );
                    $dosage.append( $preparationSelect );
                    $dosage.append( '<br />' );
                }
            }
        }


        $calculationContainer
            .append(
                $label,
                $indication,
                $dosage
            );


        return;



        var calculation = this;

        $calculationContainer.each( function() {
            $( this ).empty();




            if( calculation.hasInfo() ) {
                var infoHtml = '';

                if( calculation.description ) {
                    infoHtml += $( '<p>', {
                        html: calculation.description
                    } )[ 0 ].outerHTML;
                }

                if( calculation.formula ) {
                    infoHtml += $( '<span>', {
                        class: calculation.getContainerClass() + '-formula'
                    } )[ 0 ].outerHTML;

                    var api = new mw.Api();

                    api.parse( calculation.formula ).then( function( result ) {
                        $( '.' + calculation.getContainerClass() + '-formula' ).html( result );
                    } );
                }

                if( calculation.references.length ) {
                    var $references = $( '<ol>' );

                    for( var iReference in calculation.references ) {
                        $references.append( $( '<li>', {
                            text: calculation.references[ iReference ]
                        } ) );
                    }

                    infoHtml += $references[ 0 ].outerHTML;
                }

                var infoContainerId = calculation.getContainerClass() + '-info';
                var $infoContainer = $( '#' + infoContainerId );

                if( $infoContainer.length ) {
                    $infoContainer.empty();
                }

                $infoContainer = $( '<tr>', {
                    id: infoContainerId,
                    class: 'collapse'
                } )
                    .append( $( '<td>', {
                        colspan: 2
                    } ).append( infoHtml ) );


                $( this ).after( $infoContainer );
            }
        } );
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getCalculationData = function() {
        var inputData = new mw.calculators.objectClasses.CalculationData();

        // Add variables created by this calculation
        var variableIds = this.getVariableIds();

        for( var variableType in variableIds ) {
            inputData.variables.optional.push( variableIds[ variableType ] );
        }

        var dataTypes = inputData.getDataTypes();

        // Data is only actually required if it is required by every dosage for the drug.
        // Data marked as required by an individual dosage that does not appear in every
        // dosage will be converted to optional.
        var requiredInputData = new mw.calculators.objectClasses.CalculationData();

        // Need a way to tell the first iteration of the loop to initialize the required variables to a value that
        // is distinct from the empty array (populated across loop using array intersect, so could become [] and shouldn't
        // reinitialize).
        var initializeRequiredData = true;

        // Iterate through each dosage to determine variable dependency
        for( var iDosage in this.drug.dosages ) {
            var dosageInputData = this.drug.dosages[ iDosage ].getCalculationData();

            inputData = inputData.merge( dosageInputData );

            for( var iDataType in dataTypes ) {
                var dataType = dataTypes[ iDataType ];

                if( initializeRequiredData ) {
                    requiredInputData[ dataType ].required = inputData[ dataType ].required;
                } else {
                    // Data is only truly required if it is required by all dosage calculations, so use array intersection
                    requiredInputData[ dataType ].required = requiredInputData[ dataType ].required.filter( function( index ) {
                        return dosageInputData[ dataType ].required.indexOf( index ) !== -1;
                    } );
                }
            }

            initializeRequiredData = false;
        }

        for( var iDataType in dataTypes ) {
            var dataType = dataTypes[ iDataType ];

            // Move any data marked required in inputData to optional if it not actually required (i.e. doesn't appear
            // in requiredInputData).
            inputData[ dataType ].optional = inputData[ dataType ].optional.concat( inputData[ dataType ].required.filter( function( index ) {
                return requiredInputData[ dataType ].required.indexOf( index ) === -1;
            } ) ).filter( mw.calculators.uniqueValues );

            inputData[ dataType ].required = requiredInputData[ dataType ].required;
        }

        return inputData;
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getCalculationDataValues = function() {
        var data = mw.calculators.objectClasses.AbstractCalculation.prototype.getCalculationDataValues.call( this );

        data.drug = this.drug;

        data.indication = data[ this.getVariablePrefix() + 'indication' ] ?
            mw.calculators.getDrugIndication( mw.calculators.getVariable( this.getVariableIds().indication ).value ) :
            null;

        delete data[ this.getVariablePrefix() + 'indication' ];

        data.preparation = data[ this.getVariablePrefix() + 'preparation' ] ?
            this.drug.preparations[ mw.calculators.getVariable( this.getVariableIds().preparation ).value ] :
            null;

        delete data[ this.getVariablePrefix() + 'preparation' ];

        return data;
    };


    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getLabelHtml = function() {
        var labelHtml = this.drug.name;

        var $label = $( '<a>', {
            href: mw.util.getUrl( this.drug.name ),
            text: labelHtml
        } );

        var highlightColor = this.drug.color.getHighlightColor();

        if( highlightColor ) {
            $label.css( 'background-color', highlightColor );
        }

        labelHtml = $label[ 0 ].outerHTML;

        return labelHtml;
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getProperties = function() {
        var inheritedProperties = mw.calculators.objectClasses.AbstractCalculation.prototype.getProperties();

        return this.mergeProperties( inheritedProperties, {
            required: [
                'drug'
            ],
            optional: []
        } );
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getVariableIds = function() {
        return {
            indication: this.getVariablePrefix() + 'indication',
            preparation: this.getVariablePrefix() + 'preparation'
        };
    };

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getVariablePrefix = function() {
        return this.drug.id + '-';
    }

    mw.calculators.objectClasses.DrugDosageCalculation.prototype.initialize = function() {
        mw.calculators.objectClasses.AbstractCalculation.prototype.initialize.call( this );

        var drug = mw.calculators.getDrug( this.drug );

        if( !drug ) {
            throw new Error( 'DrugDosage references drug "' + this.drug + '" which is not defined' );
        }

        this.drug = drug;

        var variableIds = this.getVariableIds();

        // Create variables for indication, population?, preparation select boxes? Here or m.c.addDosages() or elsewhere?
        // Will have to add them to getCalculationData too.
        var drugVariables = {};

        var indications = this.drug.getIndications();
        var indicationOptions = {};

        for( var iIndication in indications ) {
            var indication = indications[ iIndication ];

            indicationOptions[ indication.id ] = String( indication );
        }

        drugVariables[ variableIds.indication ] = {
            name: 'Indication',
            type: 'string',
            defaultValue: indications.length ? indications[ 0 ].id : null,
            options: indicationOptions
        };

        var preparations = this.drug.getPreparations();
        var preparationOptions = {};

        for( var iPreparation in preparations ) {
            var preparation = preparations[ iPreparation ];

            preparationOptions[ preparation.id ] = String( preparation );
        }

        drugVariables[ variableIds.preparation ] = {
            name: 'Preparation',
            type: 'string',
            defaultValue: preparations.length ? preparations[ 0 ].id : null,
            options: preparationOptions
        };

        mw.calculators.addVariables( drugVariables );
    };





    /**
     * Class DrugDosageCalculator
     * @param {Object} propertyValues
     * @returns {mw.calculators.objectClasses.DrugDosageCalculator}
     * @constructor
     */
    mw.calculators.objectClasses.DrugDosageCalculator = function( propertyValues ) {
        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
    };

    mw.calculators.objectClasses.DrugDosageCalculator.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculator.prototype );

    mw.calculators.objectClasses.DrugDosageCalculator.prototype.doRender = function() {
        var $calculatorContainer = $( '.' + this.getContainerClass() );

        if( !$calculatorContainer.length ) {
            return;
        }

        $calculatorContainer.addClass( this.getCalculatorClass() );

        $calculatorContainer.empty();

        $calculatorContainer.append( $( '<h4>', {
            text: this.name
        } ) );

        var $calculationsContainer = $( '<table>', {
            class: 'wikitable'
        } ).append( '<tbody>' );

        $calculatorContainer.append( $calculationsContainer );

        $calculationsContainer
            .append( $( '<tr>' )
                .append(
                    $( '<th>', {
                        class: this.getCalculatorClass() + '-drug'
                    } ).text( 'Drug' ),
                    $( '<th>', {
                        class: this.getCalculatorClass() + '-indication'
                    }  ).text( 'Indication' ),
                    $( '<th>', {
                        class: this.getCalculatorClass() + '-dose'
                    }  ).text( 'Dose' )
                )
            );

        for( var iCalculationId in this.calculations ) {
            var calculation = mw.calculators.getCalculation( this.calculations[ iCalculationId ] );
            var calculationContainerClass = calculation.getContainerClass();

            var $calculationContainer = $( '<tr>', {
                class: calculationContainerClass
            } );

            $calculationsContainer.append( $calculationContainer );

            calculation.render();
        }
    };

    mw.calculators.objectClasses.DrugDosageCalculator.prototype.getCalculatorClass = function() {
        return 'calculator-DrugDosageCalculator';
    };

    mw.calculators.objectClasses.DrugDosageCalculator.prototype.getProperties = function() {
        var inheritedProperties = mw.calculators.objectClasses.AbstractCalculator.prototype.getProperties();

        return this.mergeProperties( inheritedProperties, {
            required: [],
            optional: []
        } );
    };

}() );

@@ Line 3: / Line 3: @@
   */
 ( function() {
-     var COOKIE_EXPIRATION = 12 * 60 * 60;
+     var DEFAULT_DRUG_COLOR = 'default';
+    var DEFAULT_DRUG_POPULATION = 'general';
-     var TYPE_NUMBER = 'number';
+     mw.calculators.isValueDependent = function( value, variableId ) {
-    var TYPE_STRING = 'string';
+        // This may need generalized to support other variables in the future
+        if( variableId === 'weight' ) {
+            return value && value.formatUnits().match( /\/[\s(]*?kg/ );
+        } else {
+            throw new Error( 'Dependence "' + variableId + '" not supported by isValueDependent' );
+        }
+    };
-     var VALID_TYPES = [
+     /**
-         TYPE_NUMBER,
+     * Define units
-        TYPE_STRING
+     */
-    ];
+    mw.calculators.addUnitsBases( {
+         concentration: {
+            toString: function( units ) {
+                units = units.replace( ' pct', '%' );
-    var DEFAULT_CALCULATION_CLASS = 'SimpleCalculation';
+                 return units;
-    var DEFAULT_CALCULATOR_CLASS = 'SimpleCalculator';
-    // Polyfill to fetch unit's base. This may become unnecessary in a future version of math.js
-    math.Unit.prototype.getBase = function() {
-        for( var iBase in math.Unit.BASE_UNITS ) {
-            if( this.equalBase( math.Unit.BASE_UNITS[ iBase ] ) ) {
-                 return iBase;
              }
          }
+    } );
-        return null;
+     mw.calculators.addUnits( {
-    };
+         pct: {
+            baseName: 'concentration',
+             definition: '10 mg/mL'
-     mw.calculators = {
-        calculators: {},
-         calculations: {},
-        objectClasses: {},
-        units: {},
-        unitsBases: {},
-        variables: {},
-        addCalculations: function( calculationData, className ) {
-             className = className ? className : DEFAULT_CALCULATION_CLASS;
-            var calculations = mw.calculators.createCalculatorObjects( className, calculationData );
-            for( var calculationId in calculations ) {
-                var calculation = calculations[ calculationId ];
-                mw.calculators.calculations[ calculationId ] = calculation;
-                mw.calculators.calculations[ calculationId ].setDependencies();
-                mw.calculators.calculations[ calculationId ].recalculate();
-            }
          },
-         addCalculators: function( moduleId, calculatorData, className ) {
+         vial: {
-             className = className ? className : DEFAULT_CALCULATOR_CLASS;
+             baseName: 'VOLUME'
+        }
+    } );
-            for( var calculatorId in calculatorData ) {
-                calculatorData[ calculatorId ].module = moduleId;
-            }
-            var calculators = mw.calculators.createCalculatorObjects( className, calculatorData );
-            if( !mw.calculators.calculators.hasOwnProperty( moduleId ) ) {
+    /**
-                mw.calculators.calculators[ moduleId ] = {};
+     * DrugColor
-            }
+     */
+    mw.calculators.drugColors = {};
-            for( var calculatorId in calculators ) {
+    mw.calculators.addDrugColors = function( drugColorData ) {
-                mw.calculators.calculators[ moduleId ][ calculatorId ] = calculators[ calculatorId ];
+        var drugColors = mw.calculators.createCalculatorObjects( 'DrugColor', drugColorData );
-                mw.calculators.calculators[ moduleId ][ calculatorId ].render();
+        for( var drugColorId in drugColors ) {
-            }
+            mw.calculators.drugColors[ drugColorId ] = drugColors[ drugColorId ];
-        },
+        }
-        addUnitsBases: function( unitsBaseData ) {
+    };
-            var unitsBases = mw.calculators.createCalculatorObjects( 'UnitsBase', unitsBaseData );
-            for( var unitsBaseId in unitsBases ) {
+    mw.calculators.getDrugColor = function( drugColorId ) {
-                mw.calculators.unitsBases[ unitsBaseId ] = unitsBases[ unitsBaseId ];
+        if( mw.calculators.drugColors.hasOwnProperty( drugColorId ) ) {
-             }
+            return mw.calculators.drugColors[ drugColorId ];
-         },
+        } else {
-        addUnits: function( unitsData ) {
+             return null;
-            var units = mw.calculators.createCalculatorObjects( 'Units', unitsData );
+         }
+    };
-            for( var unitsId in units ) {
+    /**
-                if( mw.calculators.units.hasOwnProperty( unitsId ) ) {
+     * Class DrugColor
-                    continue;
+     * @param {Object} propertyValues
-                 }
+     * @returns {mw.calculators.objectClasses.DrugColor}
+     * @constructor
+     */
+    mw.calculators.objectClasses.DrugColor = function( propertyValues ) {
+        var properties = {
+            required: [
+                'id'
+            ],
+            optional: [
+                'parentColor',
+                'primaryColor',
+                'highlightColor',
+                 'striped'
+            ]
+        };
-                try {
+        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
-                    math.createUnit( unitsId, {
-                        aliases: units[ unitsId ].aliases,
-                        baseName: units[ unitsId ].baseName,
-                        definition: units[ unitsId ].definition,
-                        prefixes: units[ unitsId ].prefixes,
-                        offset: units[ unitsId ].offset,
-                    } );
-                } catch( e ) {
-                    console.warn( e.message );
-                }
-                mw.calculators.units[ units ] = units[ unitsId ];
+        this.parentColor = this.parentColor || this.id === DEFAULT_DRUG_COLOR ? this.parentColor : DEFAULT_DRUG_COLOR;
-            }
+    };
-        },
-        addVariables: function( variableData ) {
-            var variables = mw.calculators.createCalculatorObjects( 'Variable', variableData );
-            for( var variableId in variables ) {
+    mw.calculators.objectClasses.DrugColor.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-                mw.calculators.variables[ variableId ] = variables[ variableId ];
-                var cookieValue = mw.calculators.getCookieValue( variableId );
+    mw.calculators.objectClasses.DrugColor.prototype.getParentDrugColor = function() {
+        if( !this.parentColor ) {
+            return null;
+        }
-                if( cookieValue ) {
+        var parentDrugColor = mw.calculators.getDrugColor( this.parentColor );
-                    try {
-                        // isValueValid will throw an error if invalid, so the catch clause is our else condition
-                        if( mw.calculators.variables[ variableId ].isValueValid( cookieValue ) ) {
-                            mw.calculators.variables[ variableId ].setValue( cookieValue );
-                        }
-                    } catch( e ) {
-                        // Unset the cookie value since for whatever reason it's no longer valid.
-                        mw.calculators.setCookieValue( variableId, null );
-                    }
-                }
-            }
-        },
-        createCalculatorObjects: function( className, objectData ) {
-            if( !mw.calculators.objectClasses.hasOwnProperty( className ) ) {
-                throw new Error( 'Invalid class name "' + className + '"' );
-            }
-             var objects = {};
+        if( !parentDrugColor ) {
+             throw new Error( 'Parent drug color "' + this.parentColor + '" not found for drug color "' + this.id + '"' );
+        }
-            for( var objectId in objectData ) {
+        return parentDrugColor;
-                var propertyValues = objectData[ objectId ];
+    };
-                // Id can either be specified using the 'id' property, or as the property name in objectData
+    mw.calculators.objectClasses.DrugColor.prototype.getHighlightColor = function() {
-                if( propertyValues.hasOwnProperty( 'id' ) ) {
+        if( this.highlightColor ) {
-                    objectId = propertyValues.id;
+            return this.highlightColor;
-                }
+        } else if( this.parentColor ) {
-                else {
+            return this.getParentDrugColor().getHighlightColor();
-                    propertyValues.id = objectId;
+        }
-                }
+    };
-                objects[ objectId ] = new mw.calculators.objectClasses[ className ]( propertyValues );
+    mw.calculators.objectClasses.DrugColor.prototype.getPrimaryColor = function() {
-             }
+        if( this.primaryColor ) {
+            return this.primaryColor;
+        } else if( this.parentColor ) {
+             return this.getParentDrugColor().getPrimaryColor();
+        }
+    };
-             return objects;
+    mw.calculators.objectClasses.DrugColor.prototype.isStriped = function() {
-         },
+        if( this.striped !== null ) {
-        createInputGroup: function( variableIds ) {
+             return this.striped;
-             var $form = $( '<form>', {
+         } else if( this.parentColor ) {
+             return this.getParentDrugColor().isStriped();
+        }
+    };
-            } );
-            var $formRow = $( '<div>', {
-                class: 'form-row'
-            } ).css( 'flex-wrap', 'nowrap' );
-            for( var iVariableId in variableIds ) {
-                var variableId = variableIds[ iVariableId ];
-                if( !mw.calculators.variables.hasOwnProperty( variableId ) ) {
-                    throw new Error( 'Invalid variable name "' + variableId + '"' );
-                }
-                $formRow.append( mw.calculators.variables[ variableId ].createInput() );
+    /**
-            }
+     * DrugPopulation
+     */
-            return $form.append( $formRow );
+    mw.calculators.drugPopulations = {};
-        },
-        getCookieKey: function( variableId ) {
-            return 'calculators-var-' + variableId;
-        },
-        getCookieValue: function( varId ) {
-            var cookieValue = mw.cookie.get( mw.calculators.getCookieKey( varId ) );
-            if( !cookieValue ) {
+    mw.calculators.addDrugPopulations = function( drugPopulationData ) {
-                return null;
+        var drugPopulations = mw.calculators.createCalculatorObjects( 'DrugPopulation', drugPopulationData );
-            }
-            return cookieValue;
+         for( var drugPopulationId in drugPopulations ) {
-        },
+             mw.calculators.drugPopulations[ drugPopulationId ] = drugPopulations[ drugPopulationId ];
-         getCalculation: function( calculationId ) {
+        }
-             if( mw.calculators.calculations.hasOwnProperty( calculationId ) ) {
+    };
-                return mw.calculators.calculations[ calculationId ];
-            } else {
-                return null;
-            }
-        },
-        getCalculator: function( moduleId, calculatorId ) {
-            if( mw.calculators.calculators.hasOwnProperty( moduleId ) &&
-                mw.calculators.calculators[ moduleId ].hasOwnProperty( calculatorId ) ) {
-                return mw.calculators.calculators[ moduleId ][ calculatorId ];
-            } else {
-                return null;
-            }
-        },
-        getUnitsString: function( value ) {
-            if( typeof value !== 'object' ) {
-                return null;
-            }
-            var unitsString = value.formatUnits();
+    mw.calculators.getDrugPopulation = function( drugPopulationId ) {
+        if( mw.calculators.drugPopulations.hasOwnProperty( drugPopulationId ) ) {
+            return mw.calculators.drugPopulations[ drugPopulationId ];
+        } else {
+            return null;
+        }
+    };
-            var reDenominator = /\/\s?\((.*)\)/;
-            var denominatorMatches = unitsString.match( reDenominator );
-            if( denominatorMatches ) {
-                var denominatorUnits = denominatorMatches[ 1 ];
-                unitsString = unitsString.replace( reDenominator, '/' + denominatorUnits.replace( ' ', '/' ) );
+    /**
-             }
+     * Class DrugPopulation
+     * @param {Object} propertyValues
+     * @returns {mw.calculators.objectClasses.DrugPopulation}
+     * @constructor
+     */
+    mw.calculators.objectClasses.DrugPopulation = function( propertyValues ) {
+        var properties = {
+            required: [
+                'id',
+                'name'
+            ],
+            optional: [
+                'abbreviation',
+                'variables'
+             ]
+        };
-            unitsString = unitsString
+        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
-                .replace( /\s/g, '' )
-                .replace( /(\^(\d+))/g, '<sup>$2</sup>' );
-            var unitsBase = value.getBase();
-             if( unitsBase ) {
+        if( this.variables ) {
-                 if( mw.calculators.unitsBases.hasOwnProperty( unitsBase ) &&
+             for( var variableId in this.variables ) {
-                    typeof mw.calculators.unitsBases[ unitsBase ].toString === 'function' ) {
+                 if( !mw.calculators.getVariable( variableId ) ) {
-                     unitsString = mw.calculators.unitsBases[ unitsBase ].toString( unitsString );
+                     throw new Error( 'DrugPopulation variable "' + variableId + '" not defined' );
                  }
-            } else {
-                // TODO nasty hack to fix weight units in compound units which have no base
-                unitsString = unitsString.replace( 'kgwt', 'kg' );
-                unitsString = unitsString.replace( 'ug', 'mcg' );
-            }
-            return unitsString;
-        },
-        getValueDecimals: function( value ) {
-            // Supports either numeric values or math objects
-            if( mw.calculators.isValueMathObject( value ) ) {
-                value = mw.calculators.getValueNumber( value );
-            }
-            if( typeof value !== 'number' ) {
+                this.variables[ variableId ].min = this.variables[ variableId ].hasOwnProperty( 'min' ) ?
-                return null;
+                    math.unit( this.variables[ variableId ].min ) : null;
-            }
-            // Convert the number to a string, reverse, and count the number of characters up to the period.
+                this.variables[ variableId ].max = this.variables[ variableId ].hasOwnProperty( 'max' ) ?
-            var decimals = value.toString().split('').reverse().join('').indexOf( '.' );
+                    math.unit( this.variables[ variableId ].max ) : null;
-            // If no decimal is present, will be set to -1 by indexOf. If so, set to 0.
-            decimals = decimals > 0 ? decimals : 0;
-            return decimals;
-        },
-        getValueNumber: function( value, decimals ) {
-            if( typeof value !== 'object' ) {
-                return null;
              }
+        } else {
+            this.variables = {};
+        }
+    };
-            // The default decimal precision should be low enough to remove floating point errors
+    mw.calculators.objectClasses.DrugPopulation.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-            // but large enough to not lose meaningful information
-            decimals = decimals !== undefined && decimals !== null ? decimals : 10;
-            return math.round( value.toNumber(), decimals );
+    mw.calculators.objectClasses.DrugPopulation.prototype.getCalculationData = function() {
-        },
+        var inputData = new mw.calculators.objectClasses.CalculationData();
-        getValueString: function( value, decimals ) {
-            if( typeof value !== 'object' ) {
-                return null;
-            }
-             decimals = decimals !== undefined && decimals !== null ? decimals : 1;
+        for( var variableId in this.variables ) {
+             inputData.variables.required.push( variableId );
+        }
-            var valueString = String( mw.calculators.getValueNumber( value, decimals ) );
+        return inputData;
+    };
-            if( value.formatUnits() ) {
+    mw.calculators.objectClasses.DrugPopulation.prototype.getCalculationDataScore = function( dataValues ) {
-                valueString += ' ' + mw.calculators.getUnitsString( value );
+        // A return value of -1 indicates the data did not match the population definition
-            }
-            return valueString;
+         for( var variableId in this.variables ) {
-        },
+             if( !dataValues.hasOwnProperty( variableId ) ) {
-         getVariable: function( variableId ) {
+                 return -1;
-             if( mw.calculators.variables.hasOwnProperty( variableId ) ) {
-                 return mw.calculators.variables[ variableId ];
-            } else {
-                return null;
              }
-        },
-        initialize: function() {
-            $( '.calculator' ).each( function() {
-                var gadgetModule = 'ext.gadget.calculator-' + $( this ).attr( 'data-module' );
-                if( gadgetModule && mw.loader.getState( gadgetModule ) === 'registered' ) {
+            if( this.variables[ variableId ].min &&
-                    mw.loader.load( gadgetModule );
+                !math.largerEq( dataValues[ variableId ], this.variables[ variableId ].min ) ) {
-                }
+                 return -1;
-            } );
-        },
-        isMobile: function() {
-            return window.matchMedia( 'only screen and (max-width: 760px)' ).matches;
-        },
-        isValueMathObject: function( value ) {
-            return value && value.hasOwnProperty( 'value' );
-        },
-        setCookieValue: function( variableId, value ) {
-            mw.cookie.set( mw.calculators.getCookieKey( variableId ), value, {
-                expires: COOKIE_EXPIRATION
-            } );
-        },
-        setValue: function( variableId, value ) {
-            if( !mw.calculators.variables.hasOwnProperty( variableId ) ) {
-                 return false;
              }
-             if( mw.calculators.variables[ variableId ].setValue( value ) ) {
+             if( this.variables[ variableId ].max &&
-                 mw.calculators.setCookieValue( variableId, value );
+                 !math.smallerEq( dataValues[ variableId ], this.variables[ variableId ].max ) ) {
+                 return -1;
-                 return true;
              }
+        }
-            return false;
+         // If the data matches the population definition, the score corresponds to the number of variables in the
-         },
+         // population definition. This should roughly correspond to the specificity of the population.
-         uniqueValues: function( value, index, self ) {
+        return Object.keys( this.variables ).length;
-            return self.indexOf( value ) === index;
-        }
      };
-     /**
+     mw.calculators.objectClasses.DrugPopulation.prototype.toString = function() {
-     * Class CalculatorObject
+         return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
-     *
+    }
-     * @param {Object} properties
-     * @param {Object} propertyValues
-     * @returns {mw.calculators.objectClasses.CalculatorObject}
-     * @constructor
-     */
-    mw.calculators.objectClasses.CalculatorObject = function( properties, propertyValues ) {
-         propertyValues = propertyValues ? propertyValues : {};
-        if( properties ) {
-            if( properties.hasOwnProperty( 'required' ) ) {
-                for( var iRequiredProperty in properties.required ) {
-                    var requiredProperty = properties.required[ iRequiredProperty ];
-                    if( !propertyValues || !propertyValues.hasOwnProperty( requiredProperty ) ) {
-                        console.error( 'Missing required property "' + requiredProperty + '"' );
-                        console.log( propertyValues );
-                        return null;
-                    }
-                    this[ requiredProperty ] = propertyValues[ requiredProperty ];
-                    delete propertyValues[ requiredProperty ];
+    /**
-                }
+     * DrugIndication
-            }
+     */
+    mw.calculators.drugIndications = {};
-            if( properties.hasOwnProperty( 'optional' ) ) {
-                for( var iOptionalProperty in properties.optional ) {
-                    var optionalProperty = properties.optional[ iOptionalProperty ];
-                    if( propertyValues && propertyValues.hasOwnProperty( optionalProperty ) ) {
-                        this[ optionalProperty ] = propertyValues[ optionalProperty ];
-                        delete propertyValues[ optionalProperty ];
-                    } else if( typeof this[ optionalProperty ] === 'undefined' ) {
-                        this[ optionalProperty ] = null;
-                    }
-                }
-            }
-            var invalidProperties = Object.keys( propertyValues );
+    mw.calculators.addDrugIndications = function( drugIndicationData ) {
+        var drugIndications = mw.calculators.createCalculatorObjects( 'DrugIndication', drugIndicationData );
-            if( invalidProperties.length ) {
+        for( var drugIndicationId in drugIndications ) {
-                console.warn( 'Unsupported properties defined for ' + typeof this + ' with id "' + this.id + '": ' + invalidProperties.join( ', ' ) );
+            mw.calculators.drugIndications[ drugIndicationId ] = drugIndications[ drugIndicationId ];
-            }
          }
      };
-     mw.calculators.objectClasses.CalculatorObject.prototype.getProperties = function() {
+     mw.calculators.getDrugIndication = function( drugIndicationId ) {
-         return {
+         if( mw.calculators.drugIndications.hasOwnProperty( drugIndicationId ) ) {
-             required: [],
+             return mw.calculators.drugIndications[ drugIndicationId ];
-             optional: []
+        } else {
-         };
+             return null;
+         }
      };
-    mw.calculators.objectClasses.CalculatorObject.prototype.mergeProperties = function( inheritedProperties, properties ) {
-        var uniqueValues = function( value, index, self ) {
-            return self.indexOf( value ) === index;
-        };
-        properties.required = inheritedProperties.required.concat( properties.required ).filter( uniqueValues );
-        properties.optional = inheritedProperties.optional.concat( properties.optional ).filter( uniqueValues );
-        return properties;
-    };
      /**
-      * Class UnitsBase
+      * Class DrugIndication
       * @param {Object} propertyValues
-      * @returns {mw.calculators.objectClasses.UnitsBase}
+      * @returns {mw.calculators.objectClasses.DrugIndication}
       * @constructor
       */
-     mw.calculators.objectClasses.UnitsBase = function( propertyValues ) {
+     mw.calculators.objectClasses.DrugIndication = function( propertyValues ) {
          var properties = {
              required: [
-                 'id'
+                 'id',
+                'name'
              ],
              optional: [
-                 'toString'
+                 'abbreviation'
              ]
          };
@@ Line 406: / Line 277: @@
      };
-     mw.calculators.objectClasses.UnitsBase.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
+     mw.calculators.objectClasses.DrugIndication.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
+    mw.calculators.objectClasses.DrugIndication.prototype.toString = function() {
+        return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
+    };
@@ Line 412: / Line 288: @@
      /**
-      * Class Units
+      * Drug
-     * @param {Object} propertyValues
-     * @returns {mw.calculators.objectClasses.Units}
-     * @constructor
       */
-     mw.calculators.objectClasses.Units = function( propertyValues ) {
+     mw.calculators.drugs = {};
-         var properties = {
-            required: [
+    mw.calculators.addDrugs = function( drugData ) {
-                'id'
+         var drugs = mw.calculators.createCalculatorObjects( 'Drug', drugData );
-            ],
-            optional: [
-                'aliases',
-                'baseName',
-                'definition',
-                'offset',
-                'prefixes'
-            ]
-        };
-         mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
+         for( var drugId in drugs ) {
+            mw.calculators.drugs[ drugId ] = drugs[ drugId ];
+        }
      };
-     mw.calculators.objectClasses.Units.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
+     mw.calculators.addDrugDosages = function( drugId, drugDosageData ) {
+        var drug = mw.calculators.getDrug( drugId );
+        if( !drug ) {
+            throw new Error( 'DrugDosage references drug "' + drugId + '" which is not defined' );
+        }
+        drug.addDosages( drugDosageData );
+        var calculationId = 'drugDosage-' + drugId;
+        var calculation = mw.calculators.getCalculation( calculationId );
+        if( !calculation ) {
+            var calculationData = {};
+            calculationData[ calculationId ] = {
+                calculate: mw.calculators.objectClasses.DrugDosageCalculation.prototype.calculate,
+                drug: drugId,
+                type: 'drug'
+            };
+            mw.calculators.addCalculations( calculationData, 'DrugDosageCalculation' );
+            calculation = mw.calculators.getCalculation( calculationId );
+        }
+        calculation.setDependencies();
+    };
+    mw.calculators.getDrug = function( drugId ) {
+        if( mw.calculators.drugs.hasOwnProperty( drugId ) ) {
+            return mw.calculators.drugs[ drugId ];
+        } else {
+            return null;
+        }
+    };
      /**
-      * Class Variable
+      * Class Drug
       * @param {Object} propertyValues
-      * @returns {mw.calculators.objectClasses.Variable}
+      * @returns {mw.calculators.objectClasses.Drug}
       * @constructor
       */
-     mw.calculators.objectClasses.Variable = function( propertyValues ) {
+     mw.calculators.objectClasses.Drug = function( propertyValues ) {
          var properties = {
              required: [
                  'id',
-                 'name',
+                 'name'
-                'type'
              ],
              optional: [
-                 'abbreviation',
+                 'color'
-                'defaultValue',
-                'maxLength',
-                'options',
-                'units'
              ]
          };
@@ Line 463: / Line 358: @@
          mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
-         if( VALID_TYPES.indexOf( this.type ) === -1 ) {
+         if( !this.color ) {
-             throw new Error( 'Invalid type "' + this.type + '" for variable "' + this.id + '"' );
+             this.color = DEFAULT_DRUG_COLOR;
          }
-         // Accept options as either an array of strings, or an object with ids as keys and display text as values
+         var color = mw.calculators.getDrugColor( this.color );
-        if( Array.isArray( this.options ) ) {
-            var options = {};
-            for( var iOption in this.options ) {
-                var option = this.options[ iOption ];
-                options[ option ] = option;
+        if( !color ) {
-            }
+             throw new Error( 'Invalid drug color "' + this.color + '" for drug "' + this.id + '"' );
-             this.options = options;
          }
-         this.calculations = [];
+         this.color = color;
-         if( this.defaultValue ) {
+         this.dosages = [];
-            this.setValue( this.defaultValue );
+         this.preparations = [];
-         } else {
-            this.value = null;
-        }
      };
-     mw.calculators.objectClasses.Variable.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
+     mw.calculators.objectClasses.Drug.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-     mw.calculators.objectClasses.Variable.prototype.addCalculation = function( calculationId ) {
+     mw.calculators.objectClasses.Drug.prototype.addDosages = function( drugDosageData ) {
-         if( this.calculations.indexOf( calculationId ) !== -1 ) {
+         var dosages = mw.calculators.createCalculatorObjects( 'DrugDosage', drugDosageData );
-            return;
-        }
-         this.calculations.push( calculationId );
+         for( var dosageId in dosages ) {
-    };
+            dosages[ dosageId ].id = this.dosages.length;
-    mw.calculators.objectClasses.Variable.prototype.createInput = function( inputOptions ) {
+            this.dosages.push( dosages[ dosageId ] );
-        if( !inputOptions ) {
-            inputOptions = {};
          }
+    };
-        inputOptions.class = inputOptions.hasOwnProperty( 'class' ) ? inputOptions.class : '';
+    mw.calculators.objectClasses.Drug.prototype.getIndications = function() {
-        inputOptions.hideLabel = inputOptions.hasOwnProperty( 'hideLabel' ) ? inputOptions.hideLabel : false;
+         var indications = [];
-        inputOptions.inline = inputOptions.hasOwnProperty( 'inline' ) ? inputOptions.tag : false;
-         inputOptions.inputClass = inputOptions.hasOwnProperty( 'inputClass' ) ? inputOptions.inputClass : '';
-         var variableId = this.id;
+         for( var iDosage in this.dosages ) {
+             if( this.dosages[ iDosage ].indication ) {
-        var inputContainerAttribs = {
+                indications.push( this.dosages[ iDosage ].indication );
-             class: 'form-group mb-0 calculator-container-input'
+             }
-        };
-        inputContainerAttribs.class += inputOptions.class ? ' ' + inputOptions.class : '';
-        inputContainerAttribs.class += ' calculator-container-input-' + variableId;
-        var tag = inputOptions.inline ? '<span>' : '<div>';
-        // Create the input container
-        var $inputContainer = $( tag, inputContainerAttribs );
-        // Set the input id
-        var inputId = 'calculator-input-' + variableId;
-        // Initialize label attributes
-        var labelAttributes = {
-            for: inputId,
-            text: this.getLabelString()
-        };
-        if( inputOptions.hideLabel ) {
-             labelAttributes.class = 'sr-only';
          }
-         // Create the input label and append to the container
+         return indications.filter( mw.calculators.uniqueValues );
-        $inputContainer.append( $( '<label>', labelAttributes ) );
+    };
-        if( this.type === TYPE_NUMBER ) {
+    mw.calculators.objectClasses.Drug.prototype.getPopulations = function( indicationId ) {
-            // Initialize the primary units variables (needed for handlers, even if doesn't have units)
+        var populations = [];
-            var unitsId = null;
-            var $unitsContainer = null;
-            var inputValue = '';
+        for( var iDosage in this.dosages ) {
+             if( this.dosages[ iDosage ].population &&
-             if( this.isValueMathObject() ) {
+                 ( !indicationId || ( this.dosages[ iDosage ].indication && this.dosages[ iDosage ].indication.id === indicationId ) ) ) {
-                 var number = this.value.toNumber();
+                 populations.push( this.dosages[ iDosage ].population );
-                if( number ) {
-                    inputValue = number;
-                 }
-            } else {
-                inputValue = this.value;
              }
+        }
-            // Initialize input options
+        return populations.filter( mw.calculators.uniqueValues );
-            var inputAttributes = {
+    };
-                id: inputId,
-                class: 'form-control calculator-input calculator-input-text',
-                type: 'text',
-                autocomplete: 'off',
-                inputmode: 'decimal',
-                value: inputValue
-            };
-            // Configure additional options
+    mw.calculators.objectClasses.Drug.prototype.getPreparations = function() {
-            if( this.maxLength ) {
+        return this.preparations.filter( mw.calculators.uniqueValues );
-                inputAttributes.maxlength = this.maxLength;
+    };
-            }
-            // Add any additional classes to the input
-            inputAttributes.class += inputOptions.inputClass ? ' ' + inputOptions.inputClass : '';
-            // Add the input id to the list of classes
-            inputAttributes.class += ' ' + inputId;
-            // If the variable has units, create the units input
-            if( this.hasUnits() ) {
-                // Set the units id
-                unitsId = inputId + '-units';
-                var unitsValue = this.isValueMathObject() ? this.value.formatUnits() : null;
-                // Create the units container
+    /**
-                $unitsContainer = $( '<div>', {
+     * DrugPreparation
-                    class: 'input-group-append'
+     */
-                } );
+    mw.calculators.addDrugPreparations = function( drugId, drugPreparationData ) {
+        if( !mw.calculators.getDrug( drugId ) ) {
+            throw new Error( 'DrugPreparation references drug "' + drugId + '" which is not defined' );
+        }
-                // Initialize the units input options
+        for( var drugPreparationId in drugPreparationData ) {
-                var unitsInputAttributes = {
+            drugPreparationData[ drugPreparationId ].drug = drugId;
-                    id: unitsId,
+        }
-                    class: 'custom-select calculator-input-select'
-                };
-                // Add any additional classes to the input
+        var drugPreparations = mw.calculators.createCalculatorObjects( 'DrugPreparation', drugPreparationData );
-                unitsInputAttributes.class += inputOptions.inputClass ? ' ' + inputOptions.inputClass : '';
-                unitsInputAttributes.class = unitsInputAttributes.class + ' ' + unitsId;
+        for( var drugPreparationId in drugPreparations ) {
+            mw.calculators.drugs[ drugId ].preparations[ drugPreparationId ] = drugPreparations[ drugPreparationId ];
+        }
+    };
-                var $unitsInput = $( '<select>', unitsInputAttributes )
-                    .on( 'change', function() {
-                        var newValue = $( '#' + inputId ).val() + ' ' + $( this ).val();
-                        mw.calculators.setValue( variableId, newValue );
-                    } );
-                for( var iUnits in this.units ) {
+    /**
-                    var units = this.units[ iUnits ];
+     * Class DrugPreparation
+     * @param {Object} propertyValues
+     * @returns {mw.calculators.objectClasses.DrugPreparation}
+     * @constructor
+     */
+    mw.calculators.objectClasses.DrugPreparation = function( propertyValues ) {
+        var properties = {
+            required: [
+                'drug',
+                'id',
+                'concentration'
+            ],
+            optional: [
+                'dilutionRequired',
+                'commonDilution'
+            ]
+        };
-                    var unitsOptionAttributes = {
+        mw.calculators.objectClasses.CalculatorObject.call( this, properties, propertyValues );
-                        text: mw.calculators.getUnitsString( math.unit( '0 ' + units ) ),
-                        value: units
-                    };
-                    if( units === unitsValue ) {
-                        unitsOptionAttributes.selected = true;
-                    }
-                    $unitsInput.append( $( '<option>', unitsOptionAttributes ) );
+        this.concentration = this.concentration.replace( 'mcg', 'ug' );
-                }
-                $unitsContainer.append( $unitsInput );
+        this.concentration = math.unit( this.concentration );
-            }
+    };
-            // Create the input and add handlers
+    mw.calculators.objectClasses.DrugPreparation.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-            var $input = $( '<input>', inputAttributes )
-                .on( 'input', function() {
-                    var newValue = $( this ).val();
-                    if( unitsId ) {
+    mw.calculators.objectClasses.DrugPreparation.prototype.getVolumeUnits = function() {
-                        newValue = newValue + ' ' + $( '#' + unitsId ).val();
+        // The units of concentration will always be of the form "mass / volume"
-                    }
+        // The regular expression matches all text leading up to the volume units
+        return this.concentration.formatUnits().replace( /.*\/\s?/, '' );
+    };
-                    mw.calculators.setValue( variableId, newValue );
+    mw.calculators.objectClasses.DrugPreparation.prototype.toString = function() {
-                } );
+        return mw.calculators.getValueString( this.concentration );
+    };
-            // Create the input group
-            var $inputGroup = $( '<div>', {
-                class: 'input-group'
-            } ).append( $input );
-            if( $unitsContainer ) {
-                $inputGroup.append( $unitsContainer );
-            }
-            $inputContainer.append( $inputGroup );
-        } else if( this.type === TYPE_STRING ) {
-            if( this.hasOptions() ) {
-                var selectAttributes = {
-                    id: inputId,
-                    class: 'custom-select calculator-input calculator-input-select'
-                };
-                // Add any additional classes to the input
-                selectAttributes.class += selectAttributes.inputClass ? ' ' + selectAttributes.inputClass : '';
-                var $select = $( '<select>', selectAttributes )
+    /**
-                    .on( 'change', function() {
+     * Class DrugDosage
-                        mw.calculators.setValue( variableId, $( this ).val() );
+     * @param {Object} propertyValues
-                    } );
+     * @returns {mw.calculators.objectClasses.DrugDosage}
+     * @constructor
+     */
+    mw.calculators.objectClasses.DrugDosage = function( propertyValues ) {
+        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-                for( var optionId in this.options ) {
+        var drugIndication = mw.calculators.getDrugIndication( this.indication );
-                    var displayText = this.options[ optionId ];
-                    var optionAttributes = {
+        if( !drugIndication ) {
-                        value: optionId,
+            throw new Error( 'Invalid indication "' + this.indication + '" for drug dosage' );
-                        text: displayText
-                    };
-                    if( optionId === this.value ) {
-                        optionAttributes.selected = true;
-                    }
-                    $select.append( $( '<option>', optionAttributes ) );
-                }
-                $inputContainer.append( $select );
-            }
          }
-         return $inputContainer;
+         this.indication = drugIndication;
-    };
-    mw.calculators.objectClasses.Variable.prototype.getLabelString = function() {
+        this.population = this.population ? this.population : DEFAULT_DRUG_POPULATION;
-        return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
-    };
-    mw.calculators.objectClasses.Variable.prototype.getValueString = function() {
+        var drugPopulation = mw.calculators.getDrugPopulation( this.population );
-        return String( this.value );
-    };
-    mw.calculators.objectClasses.Variable.prototype.hasOptions = function() {
+         if( !drugPopulation ) {
-         return this.options !== null;
+             throw new Error( 'Invalid population "' + this.population + '" for drug dosage' );
-    };
-    mw.calculators.objectClasses.Variable.prototype.hasUnits = function() {
-        return this.units !== null;
-    };
-    mw.calculators.objectClasses.Variable.prototype.hasValue = function() {
-        if( !this.value ||
-             ( this.isValueMathObject() && !this.value.toNumber() ) ) {
-            return false;
          }
-         return true;
+         this.population = drugPopulation;
-    };
-    mw.calculators.objectClasses.Variable.prototype.isValueMathObject = function() {
-        return mw.calculators.isValueMathObject( this.value );
-    };
-    mw.calculators.objectClasses.Variable.prototype.isValueValid = function( value ) {
-        if( this.type === TYPE_NUMBER ) {
-            if( typeof value !== 'object' ) {
-                value = math.unit( value );
-            }
-            if( this.hasUnits() ) {
+        this.route = this.route ? this.route : 'IV';
-                var valueUnits = value.formatUnits();
-                if( !valueUnits ) {
+        var drugDoseData = this.dose;
-                    throw new Error( 'Could not set value for "' + this.id + '": Value must define units' );
+         this.dose = [];
-                } else if( this.units.indexOf( valueUnits ) === -1 ) {
-                    throw new Error( 'Could not set value for "' + this.id + '": Units "' + valueUnits + '" are not valid for this variable' );
-                }
-            }
-         } else if( this.hasOptions() ) {
-            if( !this.options.hasOwnProperty( value ) ) {
-                throw new Error( 'Could not set value "' + value + '" for "' + this.id + '": Value must define be one of: ' + Object.keys( this.options ).join( ', ' ) );
-            }
-        }
-         return true;
+         this.addDoses( drugDoseData );
      };
-     mw.calculators.objectClasses.Variable.prototype.setValue = function( value ) {
+     mw.calculators.objectClasses.DrugDosage.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-        if( !this.isValueValid( value ) ) {
-            // isValueValid will throw a meaningful error to the console
-            return false;
-        }
-        if( this.type === TYPE_NUMBER ) {
+    mw.calculators.objectClasses.DrugDosage.prototype.addDoses = function( drugDoseData ) {
-            if( typeof value !== 'object' ) {
+        // Each dosage can have one or more associated doses. Ensure this value is an array.
-                value = math.unit( value );
+        if( !Array.isArray( drugDoseData ) ) {
-            }
+            drugDoseData = [ drugDoseData ];
          }
-         this.value = value;
+         var doses = mw.calculators.createCalculatorObjects( 'DrugDose', drugDoseData );
-         for( var iCalculation in this.calculations ) {
+         for( var doseId in doses ) {
-             var calculation = mw.calculators.getCalculation( this.calculations[ iCalculation ] );
+             doses[ doseId ].id = this.dose.length;
-             if( calculation ) {
+             this.dose.push( doses[ doseId ] );
-                calculation.render();
-            }
          }
-        return true;
      };
+    mw.calculators.objectClasses.DrugDosage.prototype.getCalculationData = function() {
+        var inputData = new mw.calculators.objectClasses.CalculationData();
+        inputData = inputData.merge( this.population.getCalculationData() );
-    /**
+         for( var iDose in this.dose ) {
-     * Class AbstractCalculation
+            inputData = inputData.merge( this.dose[ iDose ].getCalculationData() );
-     * @param {Object} propertyValues
-     * @returns {mw.calculators.objectClasses.AbstractCalculation}
-     * @constructor
-     */
-    mw.calculators.objectClasses.AbstractCalculation = function( propertyValues ) {
-         mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-        this.initialize();
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-    mw.calculators.objectClasses.AbstractCalculation.prototype.addCalculation = function( calculationId ) {
-        if( this.calculations.indexOf( calculationId ) !== -1 ) {
-            return;
          }
-         this.calculations.push( calculationId );
+         return inputData;
      };
-     mw.calculators.objectClasses.AbstractCalculation.prototype.getContainerClass = function() {
+     mw.calculators.objectClasses.DrugDosage.prototype.getProperties = function() {
-        return 'calculator-calculation-' + this.id;
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.getLabelString = function() {
-        return this.id;
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.getProperties = function() {
          return {
              required: [
+                'dose',
                  'id',
-                 'calculate'
+                 'indication'
              ],
              optional: [
-                'data',
                  'description',
-                 'onRender',
+                 'population',
-                 'onRendered',
+                 'route'
-                'references',
-                'type'
              ]
          };
-     };
+     }
-    mw.calculators.objectClasses.AbstractCalculation.prototype.getValue = function() {
-        // For now, we always need to recalculate, since the calculation may not be rendered but still required by
-        // other calculations (i.e. drug dosages using lean body weight).
-        this.recalculate();
-        return this.value;
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.hasInfo = function() {
-        return false;
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.hasValue = function() {
-        if( !this.value ||
-            ( this.isValueMathObject() && !this.value.toNumber() ) ) {
-            return false;
-        }
-        return true;
+    /**
-     };
+     * Class DrugDose
+     * @param {Object} propertyValues
+     * @returns {mw.calculators.objectClasses.DrugDose}
+     * @constructor
+     */
+     mw.calculators.objectClasses.DrugDose = function( propertyValues ) {
+        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-    mw.calculators.objectClasses.AbstractCalculation.prototype.getCalculationData = function() {
+        var mathProperties = this.getMathProperties();
-        return this.data;
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.getCalculationDataValues = function() {
+        for( var iMathProperty in mathProperties ) {
-        var calculationData = this.getCalculationData();
+            var mathProperty = mathProperties[ iMathProperty ];
-        var data = {};
+            if( this[ mathProperty ] ) {
-        var missingRequiredData = '';
+                // TODO consider making a UnitsBase.weight.fromString()
-        var calculationId, calculation, variableId, variable;
+                this[ mathProperty ] = this[ mathProperty ].replace( 'kg', 'kgwt' );
+                this[ mathProperty ] = this[ mathProperty ].replace( 'mcg', 'ug' );
-        for( var iRequiredCalculation in calculationData.calculations.required ) {
+                this[ mathProperty ] = math.unit( this[ mathProperty ] );
-            calculationId = calculationData.calculations.required[ iRequiredCalculation ];
-            calculation = mw.calculators.getCalculation( calculationId );
-            if( !calculation ) {
-                throw new Error( 'Invalid required calculation "' + calculationId + '" for calculation "' + this.id + '"' );
-            } else if( !calculation.hasValue() ) {
-                if( missingRequiredData ) {
-                    missingRequiredData = missingRequiredData + ', ';
-                }
-                missingRequiredData = missingRequiredData + calculation.getLabelString();
              } else {
-                 data[ calculationId ] = calculation.value;
+                 this[ mathProperty ] = null;
              }
          }
-         for( var iRequiredVariable in calculationData.variables.required ) {
+         if( this.weightCalculation ) {
-             variableId = calculationData.variables.required[ iRequiredVariable ];
+             var weightCalculation = mw.calculators.getCalculation( this.weightCalculation );
-            variable = mw.calculators.getVariable( variableId );
-             if( !variable ) {
+             if( !weightCalculation ) {
-                 throw new Error( 'Invalid required variable "' + variableId + '" for calculation "' + this.id + '"' );
+                 throw new Error( 'Drug dose references weight calculation "' + this.weightCalculation + '" which is not defined' );
-             } else if( !variable.hasValue() ) {
+             }
-                if( missingRequiredData ) {
-                    missingRequiredData = missingRequiredData + ', ';
-                }
-                missingRequiredData = missingRequiredData + variable.getLabelString();
+            this.weightCalculation = weightCalculation;
-            } else {
-                data[ variableId ] = variable.value;
-            }
          }
+    };
-        if( missingRequiredData ) {
+    mw.calculators.objectClasses.DrugDose.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-            this.message = missingRequiredData + ' required';
-            return false;
-        }
-        for( var iOptionalCalculation in calculationData.calculations.optional ) {
+    mw.calculators.objectClasses.DrugDose.prototype.getCalculationData = function() {
-            calculationId = calculationData.calculations.optional[ iOptionalCalculation ];
+        var calculationData = new mw.calculators.objectClasses.CalculationData();
-            calculation = mw.calculators.getCalculation( calculationId );
-            if( !calculation ) {
+        var mathProperties = this.getMathProperties();
-                throw new Error( 'Invalid optional calculation "' + calculationId + '" for calculation "' + this.id + '"' );
-            }
-             data[ calculationId ] = calculation.hasValue() ? calculation.value : null;
+        // Look at dose properties to identify any variable dependence (e.g. weight-dependence)
-        }
+        for( var iMathProperty in mathProperties ) {
+             var mathProperty = mathProperties[ iMathProperty ];
-        for( var iOptionalVariable in calculationData.variables.optional ) {
+            var dosePropertyValue = this[ mathProperty ];
-            variableId = calculationData.variables.optional[ iOptionalVariable ];
-            variable = mw.calculators.getVariable( variableId );
-             if( !variable ) {
+            // For now, this only supports weight dependence, unclear if it will need to be more generalizable in the future
-                 throw new Error( 'Invalid optional variable "' + variableId + '" for calculation "' + this.id + '"' );
+             if( mw.calculators.isValueDependent( dosePropertyValue, 'weight' ) &&
+                 calculationData.variables.optional.indexOf( 'weight' ) === -1 ) {
+                calculationData.variables.optional.push( 'weight' );
              }
+        }
-             data[ variableId ] = variable.hasValue() ? variable.value : null;
+        if( this.weightCalculation ) {
+             calculationData.calculations.optional.push( this.weightCalculation.id );
          }
-         return data;
+         return calculationData;
      };
-     mw.calculators.objectClasses.AbstractCalculation.prototype.initialize = function() {
+     mw.calculators.objectClasses.DrugDose.prototype.getMathProperties = function() {
-         if( typeof this.calculate !== 'function' ) {
+         return [
-             throw new Error( 'calculate() must be a function for Calculation "' + this.id + '"' );
+            'dose',
-        }
+             'min',
+            'max',
-        // Initialize array to store calculation ids which depend on this calculation's value
+            'absoluteMin',
-         this.calculations = [];
+            'absoluteMax'
+         ];
-        this.data = new mw.calculators.objectClasses.CalculationData( this.data );
-        this.type = this.type ? this.type : TYPE_NUMBER;
-        this.message = null;
-        this.value = null;
      };
-     mw.calculators.objectClasses.AbstractCalculation.prototype.isValueMathObject = function() {
+     mw.calculators.objectClasses.DrugDose.prototype.getProperties = function() {
-         return mw.calculators.isValueMathObject( this.value );
+         return {
+            required: [
+                'id'
+            ],
+            optional: [
+                'absoluteMin',
+                'absoluteMax',
+                'dose',
+                'frequency',
+                'min',
+                'max',
+                'name',
+                'weightCalculation'
+            ]
+        };
      };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.recalculate = function() {
-        this.message = '';
-        this.value = null;
-        var data = this.getCalculationDataValues();
-        if( data === false ) {
-            return false;
-        }
-        try {
+    /**
-            var value = this.calculate( data );
+     * Class DrugDosageCalculation
+     * @param {Object} propertyValues
+     * @returns {mw.calculators.objectClasses.DrugDosageCalculation}
+     * @constructor
+     */
+    mw.calculators.objectClasses.DrugDosageCalculation = function( propertyValues ) {
+        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-            if( this.type === TYPE_NUMBER && !isNaN( value ) ) {
+        this.initialize();
-                if( this.units ) {
+    };
-                    value = value + ' ' + this.units;
-                }
-                this.value = math.unit( value );
+    mw.calculators.objectClasses.DrugDosageCalculation.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculation.prototype );
-            } else {
-                this.value = value;
-            }
-            for( var iCalculation in this.calculations ) {
+    mw.calculators.objectClasses.DrugDosageCalculation.prototype.calculate = function( data ) {
-                calculation = mw.calculators.getCalculation( this.calculations[ iCalculation ] );
+        var value = {
+             population: null,
-                if( calculation ) {
+             preparation: data.preparation,
-                    calculation.render();
+             dose: []
-                }
+         };
-             }
-        } catch( e ) {
-             this.message = e.message;
-             this.value = null;
-         }
-         return true;
+         // Determine which dosage to use
-    };
+        var populationScores = [];
+        for( var iDosage in data.drug.dosages ) {
+            var drugDosage = data.drug.dosages[ iDosage ];
+            // If the indication does not match, set the score to -1
+            var populationScore = ( drugDosage.indication.id === data.indication.id ) ?
+                drugDosage.population.getCalculationDataScore( data ) : -1;
-    mw.calculators.objectClasses.AbstractCalculation.prototype.render = function() {
+             populationScores.push( populationScore );
-        this.recalculate();
-        if( typeof this.onRender === 'function' ) {
-             this.onRender();
          }
-         this.doRender();
+         var maxPopulationScore = Math.max.apply( null, populationScores );
-         if( typeof this.onRendered === 'function' ) {
+         if( maxPopulationScore < 0 ) {
-             this.onRendered();
+             return value;
          }
-    };
-    mw.calculators.objectClasses.AbstractCalculation.prototype.setDependencies = function() {
+        // If there is more than one dosage with the same score, take the first.
-         var calculationData = this.getCalculationData();
+        // This allows the data editor to decide which is most important.
+         var dosageId = populationScores.indexOf( maxPopulationScore );
-         var calculationIds = calculationData.calculations.required.concat( calculationData.calculations.optional );
+         var dosage = data.drug.dosages[ dosageId ];
-         for( var iCalculationId in calculationIds ) {
+         value.population = dosage.population;
-            var calculationId = calculationIds[ iCalculationId ];
-            if( !mw.calculators.calculations.hasOwnProperty( calculationId ) ) {
+        // A dosage may contain multiple doses (e.g. induction and maintenance)
-                throw new Error('Calculation "' + calculationId + '" does not exist for calculation "' + this.id + '"');
+        for( var iDose in dosage.dose ) {
-             }
+            var dose = dosage.dose[ iDose ];
+             var mathProperties = dose.getMathProperties();
-             mw.calculators.calculations[ calculationId ].addCalculation( this.id );
+             // Initialize value properties for dose
-        }
+            value.dose[ iDose ] = {
+                massPerWeight: {
+                    decimals: 0
+                },
+                mass: {
+                    decimals: 0
+                },
+                name: dose.name,
+                volume: {
+                    decimals: 0
+                },
+                weightCalculation: dose.weightCalculation ? dose.weightCalculation : null
+            };
-        var variableIds = calculationData.variables.required.concat( calculationData.variables.optional );
+            var weightValue = dose.weightCalculation ? dose.weightCalculation.value : data.weight;
-        for( var iVariableId in variableIds ) {
+            for( var iMathProperty in mathProperties ) {
-            var variableId = variableIds[ iVariableId ];
+                var mathProperty = mathProperties[ iMathProperty ];
-            if( !mw.calculators.variables.hasOwnProperty( variableId ) ) {
+                 var doseValue = dose[ mathProperty ];
-                 throw new Error('Variable "' + variableId + '" does not exist for calculation "' + this.id + '"');
-            }
-            mw.calculators.variables[ variableId ].addCalculation( this.id );
+                if( doseValue ) {
-        }
+                    var doseValueDecimals = mw.calculators.getValueDecimals( doseValue );
-    };
+                    if( mw.calculators.isValueDependent( doseValue, 'weight' ) ) {
+                        value.dose[ iDose ].massPerWeight[ mathProperty ] = doseValue;
+                        // Set the decimals based upon the specified dose
+                        value.dose[ iDose ].massPerWeight.decimals = math.max(
+                            doseValueDecimals,
+                            value.dose[ iDose ].massPerWeight.decimals
+                        );
-    mw.calculators.objectClasses.AbstractCalculation.prototype.doRender = function() {};
+                        // For whatever reason math.format will simplify the units, but math.formatUnits will not
+                        // as a hack, we recreate a new unit value with the correct formatting of the result
+                        value.dose[ iDose ].mass[ mathProperty ] = weightValue ? math.unit( math.multiply( doseValue, weightValue ).format() ) : null;
+                        // Mass should use one fewer decimals than massPerWeight (unless already 0)
+                        value.dose[ iDose ].mass.decimals = math.max(
+                            math.max( doseValueDecimals - 1, 0 ),
+                            value.dose[ iDose ].mass.decimals
+                        );
+                    } else {
+                        value.dose[ iDose ].mass[ mathProperty ] = doseValue;
+                        // Set the decimals based upon the specified dose
+                        value.dose[ iDose ].mass.decimals = math.max(
+                            doseValueDecimals,
+                            value.dose[ iDose ].mass.decimals
+                        );
+                    }
-    /**
+                    if( data.preparation && value.dose[ iDose ].mass[ mathProperty ] ) {
-     * Class CalculationData
+                        // Same hack as above to get units to simplify correctly
-     * @param {Object} propertyValues
+                        value.dose[ iDose ].volume[ mathProperty ] = math.unit( math.multiply( value.dose[ iDose ].mass[ mathProperty ], math.divide( 1, data.preparation.concentration ) ).format() );
-     * @returns {mw.calculators.objectClasses.CalculationData}
-     * @constructor
-     */
-    mw.calculators.objectClasses.CalculationData = function( propertyValues ) {
-        mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-        var dataTypes = this.getDataTypes();
+                        // value.dose[ iDose ].volume.decimals = 0;
+                     }
-        for( var iDataType in dataTypes ) {
+                 }
-            var dataType = dataTypes[ iDataType ];
-            if( !this[ dataType ] ) {
-                this[ dataType ] = {
-                     optional: [],
-                    required: []
-                 };
-            } else {
-                this[ dataType ].optional = this[ dataType ].hasOwnProperty( 'optional' ) ? this[ dataType ].optional : [];
-                this[ dataType ].required = this[ dataType ].hasOwnProperty( 'required' ) ? this[ dataType ].required : [];
              }
          }
+        return value;
      };
-     mw.calculators.objectClasses.CalculationData.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
+     mw.calculators.objectClasses.DrugDosageCalculation.prototype.doRender = function() {
+        var $calculationContainer = $( '.' + this.getContainerClass() );
-    mw.calculators.objectClasses.CalculationData.prototype.getDataTypes = function() {
+        if( !$calculationContainer.length ) {
-        return [
+            return;
-            'calculations',
+         }
-            'variables'
-         ];
-    };
-    mw.calculators.objectClasses.CalculationData.prototype.getProperties = function() {
+        $calculationContainer.empty();
-        return {
-            required: [],
-            optional: [
-                'calculations',
-                'variables'
-            ]
-        };
-    };
+        // Label column
+        var labelAttributes = {};
+        var labelCss = {};
+        if( this.drug.color.isStriped() ) {
+            labelCss[ 'background' ] = 'repeating-linear-gradient(135deg,rgba(0,0,0,0),rgba(0,0,0,0)10px,rgba(255,255,255,1)10px,rgba(255,255,255,1)20px),' + this.drug.color.getPrimaryColor();
+        } else {
+            labelCss[ 'background-color'] = this.drug.color.getPrimaryColor();
+        }
-    mw.calculators.objectClasses.CalculationData.prototype.merge = function() {
+        var $label = $( '<th>', labelAttributes ).css( labelCss );
-        var mergedData = new mw.calculators.objectClasses.CalculationData();
-         var data = [ this ].concat( Array.prototype.slice.call( arguments ) );
+         $label.append( this.getLabelHtml() );
-         var dataTypes = this.getDataTypes();
+         var $infoButton = null;
-         for( var iData in data ) {
+         if( this.hasInfo() ) {
-             for( var iDataType in dataTypes ) {
+             $infoButton = $( '<a>', {
-                 var dataType = dataTypes[ iDataType ];
+                'data-toggle': 'collapse',
+                href: '#' + this.getContainerClass() + '-info',
+                role: 'button',
+                'aria-expanded': 'false',
+                'aria-controls': this.getContainerClass() + '-info'
+            } )
+                .append( $( '<i>', {
+                    class: 'far fa-question-circle'
+                 } ) );
-                 mergedData[ dataType ].required = mergedData[ dataType ].required
+            $label
-                    .concat( data[ iData ][ dataType ].required )
+                 .append( $( '<span>', {
-                     .filter( mw.calculators.uniqueValues );
+                     class: 'calculator-calculation-column-label-info'
+                 } )
-                 mergedData[ dataType ].optional = mergedData[ dataType ].optional
+                     .append( $infoButton )
-                     .concat( data[ iData ][ dataType ].optional )
+                );
-                    .filter( mw.calculators.uniqueValues );
-            }
          }
-         return mergedData;
+         // Indication column
-    };
+        var $indication = $( '<td>' );
+        var indications = this.drug.getIndications();
+        if( indications.length > 1 ) {
+            $indication.append( mw.calculators.getVariable( this.getVariableIds().indication  ).createInput({
+                hideLabel: true
+            } ) );
+        } else {
+            $indication.append( String( indications[ 0 ] ) );
+        }
+        // Dosage column
+        var $dosage = $( '<td>' );
+        var dash = '&ndash;';
-    /**
+        var preparations = this.drug.getPreparations();
-     * Class SimpleCalculation
+         var $preparationSelect;
-     * @param {Object} propertyValues
-     * @returns {mw.calculators.objectClasses.SimpleCalculation}
-     * @constructor
-     */
-    mw.calculators.objectClasses.SimpleCalculation = function( propertyValues ) {
-         mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
-         this.initialize();
+         if( preparations.length > 1 ) {
-    };
+            $preparationSelect = mw.calculators.getVariable( this.getVariableIds().preparation  ).createInput({
+                hideLabel: true,
+                inline: true,
+                inputClass: 'calculator-input-preparation'
+            } );
+        } else {
+            $preparationSelect = String( preparations[ 0 ] );
+        }
-    mw.calculators.objectClasses.SimpleCalculation.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculation.prototype );
+        if( this.value.population && this.value.population.id !== DEFAULT_DRUG_POPULATION ) {
+            $dosage.append( String( this.value.population ) + '<br />' );
+        }
+        for( var iDose in this.value.dose ) {
+            var doseValue = this.value.dose[ iDose ];
-    mw.calculators.objectClasses.SimpleCalculation.prototype.hasInfo = function() {
+            if( doseValue.name ) {
-        return this.description || this.formula || this.references.length;
+                $dosage.append( doseValue.name + '<br />' );
-    };
+            }
-    mw.calculators.objectClasses.SimpleCalculation.prototype.getLabelHtml = function() {
+            var massPerWeightHtml = '';
-        var labelHtml = this.getLabelString();
-        if( this.link ) {
+            if( doseValue.massPerWeight.hasOwnProperty( 'dose' ) ) {
-             var href = this.link;
+                massPerWeightHtml += mw.calculators.getValueString( doseValue.massPerWeight.dose, doseValue.massPerWeight.decimals );
+             } else if( doseValue.massPerWeight.hasOwnProperty( 'min' ) &&
+                doseValue.massPerWeight.hasOwnProperty( 'max' ) ) {
+                massPerWeightHtml += mw.calculators.getValueNumber( doseValue.massPerWeight.min, doseValue.massPerWeight.decimals );
+                massPerWeightHtml += dash;
+                massPerWeightHtml += mw.calculators.getValueString( doseValue.massPerWeight.max, doseValue.massPerWeight.decimals );
+            }
-             // Detect internal links (this isn't great)
+             if( massPerWeightHtml ) {
-            var matches = href.match( /\[\[(.*?)\]\]/ );
+                if( doseValue.weightCalculation ) {
+                    massPerWeightHtml += ' (' + doseValue.weightCalculation.getLabelString() + ')';
+                }
-            if( matches ) {
+                 $dosage.append( massPerWeightHtml + '<br />' );
-                 href = mw.util.getUrl( matches[ 1 ] );
              }
-             labelHtml = $( '<a>', {
+             var massHtml = '';
-                 href: href,
+            var massUnits = '';
-                 text: labelHtml
-             } )[ 0 ].outerHTML;
+            if( doseValue.mass.hasOwnProperty( 'dose' ) ) {
-        }
+                 massHtml += mw.calculators.getValueString( doseValue.mass.dose, doseValue.mass.decimals );
+                 massUnits = mw.calculators.getUnitsString( doseValue.mass.dose );
+             } else if( doseValue.mass.hasOwnProperty( 'min' ) &&
+                doseValue.mass.hasOwnProperty( 'max' ) ) {
+                massHtml += mw.calculators.getValueNumber( doseValue.mass.min, doseValue.mass.decimals );
+                massHtml += dash;
+                massHtml += mw.calculators.getValueString( doseValue.mass.max, doseValue.mass.decimals );
-        return labelHtml;
+                massUnits = mw.calculators.getUnitsString( doseValue.mass.min );
-    };
+            }
-    mw.calculators.objectClasses.SimpleCalculation.prototype.getLabelString = function() {
+            if( massHtml ) {
-        return mw.calculators.isMobile() && this.abbreviation ? this.abbreviation : this.name;
+                $dosage.append( massHtml + '<br />' );
-    };
+            }
-    mw.calculators.objectClasses.SimpleCalculation.prototype.getProperties = function() {
+            var volumeHtml = '';
-        var inheritedProperties = mw.calculators.objectClasses.AbstractCalculation.prototype.getProperties();
-        return this.mergeProperties( inheritedProperties, {
+            if( this.value.preparation ) {
-            required: [
+                 // Get the volume units of the preparation
-                 'name'
+                 var volumeUnits = this.value.preparation.getVolumeUnits();
-            ],
-            optional: [
-                 'abbreviation',
-                'digits',
-                'formula',
-                'link',
-                'units'
-            ]
-        } );
-    };
-    mw.calculators.objectClasses.SimpleCalculation.prototype.getValueString = function() {
+                if( !$.isEmptyObject( doseValue.mass ) && massUnits ) {
-        if( this.message ) {
+                    // Extract any remaining additional dependent units (e.g. /min)
-            return this.message;
+                    var massRemainderUnits = massUnits.replace( /.*\/?/, '' );
-        } else if( typeof this.value === 'object' && this.value.hasOwnProperty( 'value' ) ) {
-            // format() will convert the value to the most visually appealing units (e.g. 5200 mL becomes 5.2 L)
-            // We then want to turn that back into a math object.
-            var value = math.unit( this.value.format() );
-            var units = value.formatUnits();
-            var number = value.toNumber();
-            var digits = ( this.value.formatUnits() === units && this.digits !== null ) ? this.digits : 1;
+                    if( massRemainderUnits ) {
+                        volumeUnits = volumeUnits + '/' + massRemainderUnits;
+                    }
+                }
-            var valueString = String( number.toFixed( digits ) );
+                if( doseValue.volume.hasOwnProperty( 'dose' ) ) {
+                    volumeHtml += mw.calculators.getValueString( doseValue.volume.dose.to( volumeUnits ), doseValue.volume.decimals );
+                } else if( doseValue.volume.hasOwnProperty( 'min' ) &&
+                    doseValue.volume.hasOwnProperty( 'max' ) ) {
+                    volumeHtml += mw.calculators.getValueNumber( doseValue.volume.min.to( volumeUnits ), doseValue.volume.decimals );
+                    volumeHtml += dash;
+                    volumeHtml += mw.calculators.getValueString( doseValue.volume.max.to( volumeUnits ), doseValue.volume.decimals );
+                }
-            if( units ) {
+                if( volumeHtml ) {
-                valueString = valueString + ' ' + mw.calculators.getUnitsString( value );
+                    $dosage.append( volumeHtml + ' of ' );
+                    $dosage.append( $preparationSelect );
+                    $dosage.append( '<br />' );
+                }
              }
-            return valueString;
-        } else {
-            return String( this.value );
          }
-    };
-    mw.calculators.objectClasses.SimpleCalculation.prototype.doRender = function() {
-        var $calculationContainer = $( '.' + this.getContainerClass() );
-         if( !$calculationContainer.length ) {
+         $calculationContainer
-             return;
+            .append(
-        }
+                $label,
+                $indication,
+                $dosage
+             );
-        var valueString = this.getValueString();
-         var inputVariableIds = this.data.variables.required.concat( this.data.variables.optional );
+         return;
-        var missingVariableInputs = [];
-        for( var iInputVariableId in inputVariableIds ) {
-            var variableId = inputVariableIds[ iInputVariableId ];
-            if( !$( '#calculator-input-' + variableId ).length ) {
-                missingVariableInputs.push( variableId );
-            }
-        }
          var calculation = this;
@@ Line 1,202: / Line 955: @@
              $( this ).empty();
-            var isTable = this.tagName.toLowerCase() === 'tr';
-            var $infoButton = null;
-            if( calculation.hasInfo() ) {
-                $infoButton = $( '<a>', {
-                    'data-toggle': 'collapse',
-                    href: '#' + calculation.getContainerClass() + '-info',
-                    role: 'button',
-                    'aria-expanded': 'false',
-                    'aria-controls': calculation.getContainerClass() + '-info'
-                } )
-                    .append( $( '<i>', {
-                        class: 'far fa-question-circle'
-                    } ) );
-            }
-            var labelHtml = calculation.getLabelHtml();
-            if( isTable ) {
-                if( calculation.hasInfo() ) {
-                    labelHtml += $( '<span>', {
-                        class: 'calculator-calculation-column-label-info'
-                    } ).append( $infoButton )[ 0 ].outerHTML;
-                }
-                $( this )
-                    .append( $( '<th>', {
-                        html: labelHtml
-                    } ) )
-                    .append( $( '<td>', {
-                        class: 'calculator-calculation-column-value',
-                        html: valueString
-                    } ) );
-            } else {
-                $( this )
-                    .append( labelHtml + $infoButton[ 0 ].outerHTML + ': ' + valueString );
-            }
              if( calculation.hasInfo() ) {
@@ Line 1,281: / Line 998: @@
                  }
-                 if( isTable ) {
+                 $infoContainer = $( '<tr>', {
-                    $infoContainer = $( '<tr>', {
+                    id: infoContainerId,
-                        id: infoContainerId,
+                    class: 'collapse'
-                        class: 'collapse'
+                } )
-                    } )
+                    .append( $( '<td>', {
-                        .append( $( '<td>', {
+                        colspan: 2
-                            colspan: 2
+                    } ).append( infoHtml ) );
-                        } ).append( infoHtml ) );
-                } else {
-                    $infoContainer = $( '<div>', {
-                        id: infoContainerId,
-                        class: 'collapse'
-                    } ).append( infoHtml );
-                }
                  $( this ).after( $infoContainer );
              }
+        } );
+    };
-            if( missingVariableInputs.length ) {
+    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getCalculationData = function() {
-                var variablesContainerClass = 'calculator-calculation-variables ' + calculation.getContainerClass() + '-variables';
+        var inputData = new mw.calculators.objectClasses.CalculationData();
-                var inputGroup = mw.calculators.createInputGroup( missingVariableInputs );
-                if( isTable ) {
+        // Add variables created by this calculation
-                    $variablesContainer =  $( '<tr>' )
+        var variableIds = this.getVariableIds();
-                        .append( $( '<td>', {
-                            class: variablesContainerClass,
+        for( var variableType in variableIds ) {
-                            colspan: 2
+            inputData.variables.optional.push( variableIds[ variableType ] );
-                        } ).append( inputGroup ) );
+        }
+        var dataTypes = inputData.getDataTypes();
+        // Data is only actually required if it is required by every dosage for the drug.
+        // Data marked as required by an individual dosage that does not appear in every
+        // dosage will be converted to optional.
+        var requiredInputData = new mw.calculators.objectClasses.CalculationData();
+        // Need a way to tell the first iteration of the loop to initialize the required variables to a value that
+        // is distinct from the empty array (populated across loop using array intersect, so could become [] and shouldn't
+        // reinitialize).
+        var initializeRequiredData = true;
+        // Iterate through each dosage to determine variable dependency
+        for( var iDosage in this.drug.dosages ) {
+            var dosageInputData = this.drug.dosages[ iDosage ].getCalculationData();
+            inputData = inputData.merge( dosageInputData );
+            for( var iDataType in dataTypes ) {
+                var dataType = dataTypes[ iDataType ];
+                if( initializeRequiredData ) {
+                    requiredInputData[ dataType ].required = inputData[ dataType ].required;
                  } else {
-                     $variablesContainer = $( '<div>', {
+                     // Data is only truly required if it is required by all dosage calculations, so use array intersection
-                         class: variablesContainerClass
+                    requiredInputData[ dataType ].required = requiredInputData[ dataType ].required.filter( function( index ) {
-                     } ).append( inputGroup );
+                         return dosageInputData[ dataType ].required.indexOf( index ) !== -1;
+                     } );
                  }
+            }
+            initializeRequiredData = false;
+        }
+        for( var iDataType in dataTypes ) {
+            var dataType = dataTypes[ iDataType ];
-                 $( this ).after( $variablesContainer );
+            // Move any data marked required in inputData to optional if it not actually required (i.e. doesn't appear
+            // in requiredInputData).
+            inputData[ dataType ].optional = inputData[ dataType ].optional.concat( inputData[ dataType ].required.filter( function( index ) {
+                 return requiredInputData[ dataType ].required.indexOf( index ) === -1;
+            } ) ).filter( mw.calculators.uniqueValues );
-                missingVariableInputs = [];
+            inputData[ dataType ].required = requiredInputData[ dataType ].required;
-            }
+        }
-         } );
+         return inputData;
      };
+    mw.calculators.objectClasses.DrugDosageCalculation.prototype.getCalculationDataValues = function() {
+        var data = mw.calculators.objectClasses.AbstractCalculation.prototype.getCalculationDataValues.call( this );
+        data.drug = this.drug;
+        data.indication = data[ this.getVariablePrefix() + 'indication' ] ?
+            mw.calculators.getDrugIndication( mw.calculators.getVariable( this.getVariableIds().indication ).value ) :
+            null;
+        delete data[ this.getVariablePrefix() + 'indication' ];
-    /**
+        data.preparation = data[ this.getVariablePrefix() + 'preparation' ] ?
-     * Class AbstractCalculator
+            this.drug.preparations[ mw.calculators.getVariable( this.getVariableIds().preparation ).value ] :
-     * @param {Object} propertyValues
+            null;
-     * @returns {mw.calculators.objectClasses.AbstractCalculator}
-     * @constructor
+         delete data[ this.getVariablePrefix() + 'preparation' ];
-     */
-    mw.calculators.objectClasses.AbstractCalculator = function( propertyValues ) {
+        return data;
-         mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
      };
-    mw.calculators.objectClasses.AbstractCalculator.prototype = Object.create( mw.calculators.objectClasses.CalculatorObject.prototype );
-     mw.calculators.objectClasses.AbstractCalculator.prototype.getCalculatorClass = function() {
+     mw.calculators.objectClasses.DrugDosageCalculation.prototype.getLabelHtml = function() {
-         return '';
+         var labelHtml = this.drug.name;
+        var $label = $( '<a>', {
+            href: mw.util.getUrl( this.drug.name ),
+            text: labelHtml
+        } );
+        var highlightColor = this.drug.color.getHighlightColor();
+        if( highlightColor ) {
+            $label.css( 'background-color', highlightColor );
+        }
+        labelHtml = $label[ 0 ].outerHTML;
+        return labelHtml;
      };
-     mw.calculators.objectClasses.AbstractCalculator.prototype.getContainerClass = function() {
+     mw.calculators.objectClasses.DrugDosageCalculation.prototype.getProperties = function() {
-         return 'calculator-' + this.module + '-' + this.id;
+        var inheritedProperties = mw.calculators.objectClasses.AbstractCalculation.prototype.getProperties();
+         return this.mergeProperties( inheritedProperties, {
+            required: [
+                'drug'
+            ],
+            optional: []
+        } );
      };
-     mw.calculators.objectClasses.AbstractCalculator.prototype.getProperties = function() {
+     mw.calculators.objectClasses.DrugDosageCalculation.prototype.getVariableIds = function() {
          return {
-             required: [
+             indication: this.getVariablePrefix() + 'indication',
-                'id',
+             preparation: this.getVariablePrefix() + 'preparation'
-                'module',
-                'name',
-                'calculations'
-            ],
-             optional: [
-                'onRender',
-                'onRendered'
-            ]
          };
      };
-     mw.calculators.objectClasses.AbstractCalculator.prototype.render = function() {
+     mw.calculators.objectClasses.DrugDosageCalculation.prototype.getVariablePrefix = function() {
-         if( typeof this.onRender === 'function' ) {
+        return this.drug.id + '-';
-             this.onRender();
+    }
+    mw.calculators.objectClasses.DrugDosageCalculation.prototype.initialize = function() {
+        mw.calculators.objectClasses.AbstractCalculation.prototype.initialize.call( this );
+        var drug = mw.calculators.getDrug( this.drug );
+         if( !drug ) {
+            throw new Error( 'DrugDosage references drug "' + this.drug + '" which is not defined' );
+        }
+        this.drug = drug;
+        var variableIds = this.getVariableIds();
+        // Create variables for indication, population?, preparation select boxes? Here or m.c.addDosages() or elsewhere?
+        // Will have to add them to getCalculationData too.
+        var drugVariables = {};
+        var indications = this.drug.getIndications();
+        var indicationOptions = {};
+        for( var iIndication in indications ) {
+             var indication = indications[ iIndication ];
+            indicationOptions[ indication.id ] = String( indication );
          }
-         this.doRender();
+         drugVariables[ variableIds.indication ] = {
+            name: 'Indication',
+            type: 'string',
+            defaultValue: indications.length ? indications[ 0 ].id : null,
+            options: indicationOptions
+        };
+        var preparations = this.drug.getPreparations();
+        var preparationOptions = {};
-         if( typeof this.onRendered === 'function' ) {
+         for( var iPreparation in preparations ) {
-             this.onRendered();
+             var preparation = preparations[ iPreparation ];
+            preparationOptions[ preparation.id ] = String( preparation );
          }
-    };
+        drugVariables[ variableIds.preparation ] = {
+            name: 'Preparation',
+            type: 'string',
+            defaultValue: preparations.length ? preparations[ 0 ].id : null,
+            options: preparationOptions
+        };
-    mw.calculators.objectClasses.AbstractCalculator.prototype.doRender = function() {};
+        mw.calculators.addVariables( drugVariables );
+    };
@@ Line 1,381: / Line 1,190: @@
      /**
-      * Class SimpleCalculator
+      * Class DrugDosageCalculator
       * @param {Object} propertyValues
-      * @returns {mw.calculators.objectClasses.SimpleCalculator}
+      * @returns {mw.calculators.objectClasses.DrugDosageCalculator}
       * @constructor
       */
-     mw.calculators.objectClasses.SimpleCalculator = function( propertyValues ) {
+     mw.calculators.objectClasses.DrugDosageCalculator = function( propertyValues ) {
          mw.calculators.objectClasses.CalculatorObject.call( this, this.getProperties(), propertyValues );
      };
-     mw.calculators.objectClasses.SimpleCalculator.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculator.prototype );
+     mw.calculators.objectClasses.DrugDosageCalculator.prototype = Object.create( mw.calculators.objectClasses.AbstractCalculator.prototype );
-     mw.calculators.objectClasses.SimpleCalculator.prototype.doRender = function() {
+     mw.calculators.objectClasses.DrugDosageCalculator.prototype.doRender = function() {
          var $calculatorContainer = $( '.' + this.getContainerClass() );
@@ Line 1,400: / Line 1,209: @@
          $calculatorContainer.addClass( this.getCalculatorClass() );
-        if( this.css ) {
-            $calculatorContainer.css( this.css );
-        }
          $calculatorContainer.empty();
@@ Line 1,411: / Line 1,216: @@
          } ) );
-         var $calculationsContainer;
+         var $calculationsContainer = $( '<table>', {
+            class: 'wikitable'
+        } ).append( '<tbody>' );
-         if( this.table ) {
+         $calculatorContainer.append( $calculationsContainer );
-            $calculationsContainer = $( '<table>', {
-                class: 'wikitable'
-            } ).append( '<tbody>' );
-            $calculationsContainer
+        $calculationsContainer
-                .append( $( '<tr>' )
+            .append( $( '<tr>' )
-                    .append(
+                .append(
-                        $( '<th>', {
+                    $( '<th>', {
-                            class: this.getCalculatorClass() + '-label'
+                        class: this.getCalculatorClass() + '-drug'
-                        } ).text( 'Calculation' ),
+                    } ).text( 'Drug' ),
-                        $( '<th>', {
+                    $( '<th>', {
-                            class: this.getCalculatorClass() + '-value'
+                        class: this.getCalculatorClass() + '-indication'
-                        }  ).text( 'Value' )
+                    }  ).text( 'Indication' ),
-                     )
+                     $( '<th>', {
-                );
+                        class: this.getCalculatorClass() + '-dose'
-        } else {
+                    }  ).text( 'Dose' )
-            $calculationsContainer = $( '<div>' );
+                )
-        }
+            );
-        $calculatorContainer.append( $calculationsContainer );
          for( var iCalculationId in this.calculations ) {
@@ Line 1,439: / Line 1,241: @@
              var calculationContainerClass = calculation.getContainerClass();
-             var $calculationContainer = $( '.' + calculationContainerClass );
+             var $calculationContainer = $( '<tr>', {
+                class: calculationContainerClass
+            } );
-             // If a container doesn't exist yet, add it
+             $calculationsContainer.append( $calculationContainer );
-            if( !$calculationContainer.length ) {
-                if( this.table ) {
-                    $calculationContainer = $( '<tr>', {
-                        class: calculationContainerClass
-                    } );
-                } else {
-                    $calculationContainer = $( '<div>', {
-                        class: calculationContainerClass
-                    } );
-                }
-                $calculationsContainer.append( $calculationContainer );
-            }
              calculation.render();
@@ Line 1,460: / Line 1,251: @@
      };
-     mw.calculators.objectClasses.SimpleCalculator.prototype.getCalculatorClass = function() {
+     mw.calculators.objectClasses.DrugDosageCalculator.prototype.getCalculatorClass = function() {
-         return 'calculator-SimpleCalculator';
+         return 'calculator-DrugDosageCalculator';
      };
+     mw.calculators.objectClasses.DrugDosageCalculator.prototype.getProperties = function() {
-     mw.calculators.objectClasses.SimpleCalculator.prototype.getProperties = function() {
          var inheritedProperties = mw.calculators.objectClasses.AbstractCalculator.prototype.getProperties();
          return this.mergeProperties( inheritedProperties, {
              required: [],
-             optional: [
+             optional: []
-                'css',
-                'table'
-            ]
          } );
      };
-    mw.calculators.initialize();
 }() );