Permalink
Commits on Oct 16, 2012
  1. fix per eater

    yunfangjuan committed Oct 16, 2012
  2. exponential growth word problem

    yunfangjuan committed Oct 8, 2012
    Summary: an exponential growth word problem. would develop two or three more varieties. wants a preview here.
    
    Test Plan: tested in local sandbox
    
    Reviewers: eater, stephanie
    
    Differential Revision: http://phabricator.khanacademy.org/D825
  3. Back out new answer-types.js for now

    sophiebits committed Oct 16, 2012
    Auditors: emily, eater
Commits on Oct 15, 2012
  1. Merge pull request #31899 from xymostech/fix-fractions-negative

    beneater committed Oct 15, 2012
    Make sure fractions doesn't incorrectly show -1
  2. Make sure fractions doesn't incorrectly show -1

    xymostech committed Oct 15, 2012
    I think this was a typo because the same structure
    (solution > 0 ? 1 : -1) is used several times afterwards as well.
  3. Fix to rate_problems_1 to ensure the givens make sense

    beneater committed Oct 15, 2012
    Summary:
    Previously one of the distances could be zero, so the given average
    speed didn't make sense. (How can you have an average speed over zero distance?)
    This just ensures neither distance is zero.
    
    Test Plan: Tested locally outside devappserver
    
    Reviewers: stephanie, yunfangjuan
    
    Reviewed By: stephanie
    
    Differential Revision: http://phabricator.khanacademy.org/D848
  4. Fix two with combining_like_terms_2:

    beneater committed Oct 15, 2012
    Summary:
    In the ax_fbx_fd problem type, the variable coefficient could simplify to 0
    and require entering "0x+5" instead of just "5", for example. Added a data-ensure
    to ensure the coefficient is always non-zero.
    
    Also, the final hint in the eax_ec_fd_fbx problem type left off the constant
    term unless it was 0 instead of the other way around.
    
    Test Plan:
    Test locally to verify the two problems were fixed in these two seeds:
    http://sandcastle.khanacademy.org/media/castles/Khan:master/exercises/combining_like_terms_2.html?seed=62&problem=ax_fbx_fd&debug
    http://sandcastle.khanacademy.org/media/castles/Khan:master/exercises/combining_like_terms_2.html?seed=42&problem=eax_ec_fd_fbx&debug
    
    Reviewers: stephanie, yunfangjuan
    
    Reviewed By: stephanie
    
    Differential Revision: http://phabricator.khanacademy.org/D843
  5. more -> at least

    beneater committed Oct 15, 2012
    Test Plan: Tested locally
    
    Reviewers: stephanie, yunfangjuan
    
    Reviewed By: stephanie
    
    Differential Revision: http://phabricator.khanacademy.org/D837
Commits on Oct 12, 2012
  1. Fix radio answer type to require selecting an answer and be whitespac…

    beneater committed Oct 12, 2012
    …e insensitive
    
    Test Plan: Tested limits_1 and expected_value exercises in devappserver. Checked that unselected radio couldn't be selected, correct answer was accepted, and history showed up in coach reports.
    
    Reviewers: emily
    
    Reviewed By: emily
    
    Differential Revision: http://phabricator.khanacademy.org/D838
  2. Merge pull request #31742 from xymostech/fix-snapx

    beneater committed Oct 12, 2012
    Remove our 3-layer redundant snapping
  3. Remove our 3-layer redundant snapping

    xymostech committed Oct 12, 2012
    For some reason, we perform snapping 3 times, instead of the required 1.
    This apparently leads to some problems. I'm not sure why these problems
    occur, but they do, and this fixes them.
    
    Closes 31738, 31739
Commits on Oct 10, 2012
  1. Fix set answer type

    sophiebits committed Oct 10, 2012
    ... I think.
    
    Auditors: xymostech, eater
Commits on Oct 9, 2012
  1. Make answer types much more modular, and more internally consistent

    xymostech committed Oct 9, 2012
    Summary:
    Separate answer-type creation into two steps, setup (where the answer area is
    messed with) and validator creation (where a function to validate solutions is
    created). These two may only communicate by a "guess" variable, generated by
    the setup portion and evaluated by the validator portion. This allows for
    cleaner and less hacky code, and also allows for multiple solutions to be
    validated using the same setup.
    
    Some of the khan-exercise.js code had to be modified to make this work
    correctly, but most of the changes come from the rework of answer-types.js
    
    Test Plan:
    Go through lots of exercises and make sure that they still work, and that the
    timeline still works with their answers
    
    Reviewers: eater
    
    Reviewed By: eater
    
    CC: alpert
    
    Differential Revision: http://phabricator.khanacademy.org/D793
Commits on Oct 6, 2012
  1. Lint

    beneater committed Oct 6, 2012
    Test plan: Cross fingers
    
    Auditors: alpert
Commits on Oct 5, 2012
  1. Get rid of some more unused images

    csilvers committed Oct 5, 2012
    Summary:
    'grep css/ -r .' shows that only throbber.css is being used from this
    directory.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D809
  2. Remove an unused image.

    csilvers committed Oct 5, 2012
    Summary:
    Ben eater sez, at http://phabricator.khanacademy.org/D807: "I happen
    to know that images/circ.png isn't used anywhere. We can remove it,
    fwiw."
    
    Test Plan: Trust ben :-)  Also, did 'grep -r circ.png .' and found nothing.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D808
  3. Copy over the images from the KA repository.

    csilvers committed Oct 5, 2012
    Summary:
    The content of these images haven't changed, but the size has since we
    spent some time compressing images for KA.
    
    I used the following messy command to do this:
    
    khan-exercises$ find . -name '*.png' | while read i; do for subdir in "" "badges/" "avatars/"; do orig=~/khan/stable/`echo $i | sed -e s,/css,, -e s,images/,images/$subdir,`; [ -e $orig ] && cp -v $orig $i; done; done
    
    The following two files did not exist in the main KA repo, so I
    compressed them manually by running pngout on them:
       images/protractor.png images/circ.png
    
    Test Plan:
    Viewed all the images in a viewer, for before-change and after-change,
    and verified they look the same.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D807
  4. Remove unused images.

    csilvers committed Oct 5, 2012
    Summary:
    'grep -r repeating-sprites .' shows that these files aren't referenced
    anywhere.
    
    Reviewers: eater
    
    Reviewed By: eater
    
    Differential Revision: http://phabricator.khanacademy.org/D806
Commits on Oct 4, 2012
  1. rename exercises/filenames and get rid of unused graphie import

    Stephanie H. Chang committed Oct 4, 2012
  2. refactor printMatrix to use deepZipWith

    Stephanie H. Chang committed Oct 4, 2012
  3. refactors for D797

    Stephanie H. Chang committed Oct 4, 2012
  4. fixes for D797

    Stephanie H. Chang committed Oct 4, 2012
  5. add scalar matrix multiplication exercise

    Stephanie H. Chang committed Oct 4, 2012
  6. Add exercises: Matrix addition and Matrix subtraction

    Stephanie H. Chang committed Oct 2, 2012
    Summary: Also, add prependVars to tmpl.js.
    
    Test Plan: Tested locally.
    
    Reviewers: eater, yunfangjuan
    
    Differential Revision: http://phabricator.khanacademy.org/D797
  7. Remove unused import

    Stephanie H. Chang committed Oct 2, 2012
  8. Add matrix addition exercise. Also, add prependVars to tmpl.js.

    Stephanie H. Chang committed Oct 2, 2012
Commits on Oct 3, 2012
  1. Merge and squash pull request #31164 from saasmath/master

    Gary Anderson committed with beneater Oct 3, 2012
    Closes #31164
    
    commit 1261cae
    Author: Gary Anderson <git@garyvictoranderson.com>
    Date:   Wed Oct 3 04:14:58 2012 -0700
    
        Accept approximate decimal answers in computing means
    
    commit 08abd64
    Merge: 87bc7c5 d1f63a4
    Author: Gary Anderson <git@garyvictoranderson.com>
    Date:   Wed Oct 3 03:55:57 2012 -0700
    
        Merge branch 'master' of https://github.com/Khan/khan-exercises
    
    commit 87bc7c5
    Author: Gary Anderson <git@garyvictoranderson.com>
    Date:   Tue Oct 2 03:27:10 2012 -0700
    
        Accept inexact answers for area computations using z-scores.
    
        In math and statistics courses, many students are taught to use graphing calculators or other
        technology, rather than tables, to compute areas under the normal curve.  These will differ
        in the last digit frequently from the approximate z-tables, leading to incorrectly reported errors in
        the exercises.
        This fixes the issue by accepting the correctly rounded technology produced answer.
Commits on Oct 2, 2012
  1. Add exercises: Graphing circles 1 & 2

    beneater committed Oct 2, 2012
    Test Plan: Tested multiple problem seeds outside devappserver
    
    Reviewers: stephanie, yunfangjuan
    
    Reviewed By: yunfangjuan
    
    Differential Revision: http://phabricator.khanacademy.org/D777
  2. Add exercises: Law of sines and Law of cosines

    beneater committed Oct 2, 2012
    Test Plan: Tested multiple seeds for each new problem type outside devappserver
    
    Reviewers: stephanie, yunfangjuan
    
    Reviewed By: yunfangjuan
    
    Differential Revision: http://phabricator.khanacademy.org/D776
Commits on Sep 29, 2012
  1. Merge pull request #30904 from saasmath/master

    xymostech committed Sep 29, 2012
    jQuery .data() expects just a key when retrieving values
Commits on Sep 27, 2012
  1. jQuery .data() expects just a key when retrieving values.

    Gary Anderson committed Sep 27, 2012
    The existing code breaks some exercises (like function_1 and many more)
    when using a version of jQuery greater than 1.7.1.
    
    See http://api.jquery.com/data/
Commits on Sep 25, 2012
  1. Add exercise: Graphs of inequalities

    beneater committed Sep 25, 2012
    Summary:
    new problem type in graphing_inequalities
    
    finished hints sans link
    
    fixed inequality hints
    
    added more hints for point-slope formula in inequalities
    
    removed transformations exercises...
    
    Differential Revision: http://phabricator.khanacademy.org/D433