Merge pull request #474 from ccnmtl/fix-nlds

NLDS alternative function: make the function X with respect to K

Author: nbuonin

src/Graph.js

@@ -407,8 +407,8 @@ class NonLinearDemandSupplyGraph extends Graph {
                 f2Shadow = function(x) {
                     return alpha *
                         (me.options.gCobbDouglasAInitial *
-                         me.options.gCobbDouglasKInitial ** (alpha - 1)) *
-                        (x ** (1 - alpha));
+                         x ** (alpha - 1)) *
+                        (me.options.gCobbDouglasKInitial ** (1 - alpha));
                 };
             }
 
@@ -467,8 +467,8 @@ class NonLinearDemandSupplyGraph extends Graph {
             f = function(x) {
                 return alpha *
                     (me.options.gCobbDouglasA *
-                     me.options.gCobbDouglasK ** (alpha - 1)) *
-                    (x ** (1 - alpha));
+                     x ** (alpha - 1)) *
+                    (me.options.gCobbDouglasK ** (1 - alpha));
             };
         }
 

src/editors/NonLinearDemandSupplyEditor.jsx

@@ -17,7 +17,7 @@ export default class NonLinearDemandSupplyEditor extends React.Component {
     }
     render() {
         const func1 = `MP_N = (1 - α)${this.props.gCobbDouglasAName}${this.props.gCobbDouglasKName}^α N^{-α}`;
-        const func2 = `MP_${this.props.gCobbDouglasKName} = α${this.props.gCobbDouglasAName}${this.props.gCobbDouglasKName}^{α - 1} N^{1 - α}`;
+        const func2 = `MP_${this.props.gCobbDouglasKName} = α${this.props.gCobbDouglasAName}K^{α - 1} N^{1 - α}`;
         return (
             <div>
                 {this.props.isInstructor && (
@@ -111,7 +111,9 @@ export default class NonLinearDemandSupplyEditor extends React.Component {
                             </div>
                             <div className="col-sm-4">
                                 <label htmlFor="gCobbDouglasK">
-                                    {this.props.isInstructor ? (
+                                    {this.props.gFunctionChoice === 1 && 'N'}
+                                    {this.props.gFunctionChoice !== 1 &&
+                                     (this.props.isInstructor ? (
                                         <input type="text"
                                                id="gCobbDouglasKName"
                                                maxLength="1"
@@ -122,7 +124,7 @@ export default class NonLinearDemandSupplyEditor extends React.Component {
                                         />
                                     ) : (
                                         this.props.gCobbDouglasKName
-                                    )}
+                                    ))}
                                 </label>
                                 <RangeEditor
                                     dataId="gCobbDouglasK"