PCCMathSAC / apex-mbx

Repository for a conversion of APEX Calculus to MathBook XML
2 stars 10 forks source link

Oops fixed. #65

Closed CVollet closed 7 years ago

CVollet commented 8 years ago

I messed up that last commit and closed the pull request. It think it is all fixed now. I think I probably need a git tutorial on what to do in these cases. I will be starting a new branch with the next round of changes. I also started a simple text file that tracks the changes made.

Major change is sin x to sin(x). I figured that would be easier for David to write a macro to change back to sin x than worrying about all of the different cases like c(x).

Alex-Jordan commented 8 years ago

This is just for sin(x), not cos(x) and ln(x)? Also did this catch things like sin 3? Do we know this didn't turn things like \sin x^2 into \sin(x)^2?

davidfarmer commented 8 years ago

If sin(x^2) and similar things are giving you trouble, I would be happy to give it a try.

David

On Thu, 27 Oct 2016, Alex Jordan wrote:

This is just for sin(x), not cos(x) and ln(x)? Also did this catch things like sin 3? Do we know this didn't turn things like \sin x^2 into \sin(x)^2?

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or mute the thread.[AAM6LMHRtggS-OePRGAKQwwe-j-GNZc_ks5q4TPCgaJpZM4KdZHr.gif]

CVollet commented 8 years ago

Yes, just sin(x). It didn't catch things like sin(3). I actually didn't mean to "fix" them all. I was doing a search and replace in the file I was working on and realized that I actually search and replaced in all of the files in the project. I'm not savvy enough to fix things like sin(3)...yet. I'm just getting used to using Sublime. It would be nice if David could do all of the sin b, sin^2 b, etc and replace them with sin(b), sin^2(b).

Alex-Jordan commented 7 years ago

Earlier I was under the impression that this PR was only about sin(x). Now I see other things here: a blank line added to index.mbx, creation of Changes_to_APEX.txt, and deletion of sec_one_sided_limits.mbx. (Did I miss anything else?)

In #68, I've removed sec_one_sided_limits.mbx. I've also done manually editing to sec_derivatives.mbx that may lead to a merge conflict with the sin(x) changes here. And in #69 David is doing a more universal attack on sin x and friends.

So any objection to closing this PR? Then #68 can be merged. David can resubmit #69 to avoid any conflicts with #68. Then all that's left here is Changes_to_APEX.txt, which you could submit separately.

If this sounds OK, then I think you'd want to delete your dev branch and create a new one that doesn't have these four commits. Then create, add, and commit Changes_to_APEX.txt. To do the first part:

git checkout master
git fetch origin
git branch -D dev
git checkout -b dev origin/master
davidfarmer commented 7 years ago

I'd like to pull the latest version of the source and re-run the parentheses script. So let me know when it is ready, and what branch I should use.

I'll close my pending pull request.

On Thu, 3 Nov 2016, Alex Jordan wrote:

Earlier I was under the impression that this PR was only about sin(x). Now I see other things here: a blank line added to index.mbx, creation of Changes_to_APEX.txt, and deletion of sec_one_sided_limits.mbx. (Did I miss anything else?)

In #68, I've removed sec_one_sided_limits.mbx. I've also done manually editing to sec_derivatives.mbx that may lead to a merge conflict with the sin(x) changes here. And in #69 David is doing a more universal attack on sin x and friends.

So any objection to closing this PR? Then #68 can be merged. David can resubmit #69 to avoid any conflicts with #68. Then all that's left here is Changes_to_APEX.txt, which you could submit separately.

If this sounds OK, then I think you'd want to delete your dev branch and create a new one that doesn't have these four commits. Then create, add, and commit Changes_to_APEX.txt. To do the first part:

git checkout master git fetch origin git branch -D dev git checkout -b dev origin/master

— You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread.[AAM6LIIOfDHuEvcTp4oJ8_uo_3eRCL_Cks5q6YkEgaJpZM4KdZHr.gif]

CVollet commented 7 years ago

I did also make some changes to sec_derivatives.mbx and sec_limits_infty.mbx, but they were minor xrefs. I'll see if I can stash those changes and then close my pull request.

On Thu, Nov 3, 2016 at 12:11 AM, Alex Jordan notifications@github.com wrote:

Earlier I was under the impression that this PR was only about sin(x). Now I see other things here: a blank line added to index.mbx, creation of Changes_to_APEX.txt, and deletion of sec_one_sided_limits.mbx. (Did I miss anything else?)

In #68 https://github.com/PCCMathSAC/apex-mbx/pull/68, I've removed sec_one_sided_limits.mbx. I've also done manually editing to sec_derivatives.mbx that may lead to a merge conflict with the sin(x) changes here. And in #69 https://github.com/PCCMathSAC/apex-mbx/pull/69 David is doing a more universal attack on sin x and friends.

So any objection to closing this PR? Then #68 https://github.com/PCCMathSAC/apex-mbx/pull/68 can be merged. David can resubmit #69 https://github.com/PCCMathSAC/apex-mbx/pull/69 to avoid any conflicts with #68 https://github.com/PCCMathSAC/apex-mbx/pull/68. Then all that's left here is Changes_to_APEX.txt, which you could submit separately.

If this sounds OK, then I think you'd want to delete your dev branch and create a new one that doesn't have these four commits. Then create, add, and commit Changes_to_APEX.txt. To do the first part:

git checkout master git fetch origin git branch -D dev git checkout -b dev origin/master

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/65#issuecomment-258076064, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt6ynqfHfwUTcrFNL8x_dRlxrkj1cMks5q6YkFgaJpZM4KdZHr .

Carly Vollet Mathematics Instructor Math Department Co-Chair Math Club Faculty Advisor PCC Cascade, SSB 321 971-722-5564

CVollet commented 7 years ago

Closing pull request. David can try his change to the parens.

CVollet commented 7 years ago

Pull request is closed.

On Thu, Nov 3, 2016 at 9:24 AM, Carly Vollet carly.vollet@pcc.edu wrote:

I did also make some changes to sec_derivatives.mbx and sec_limits_infty.mbx, but they were minor xrefs. I'll see if I can stash those changes and then close my pull request.

On Thu, Nov 3, 2016 at 12:11 AM, Alex Jordan notifications@github.com wrote:

Earlier I was under the impression that this PR was only about sin(x). Now I see other things here: a blank line added to index.mbx, creation of Changes_to_APEX.txt, and deletion of sec_one_sided_limits.mbx. (Did I miss anything else?)

In #68 https://github.com/PCCMathSAC/apex-mbx/pull/68, I've removed sec_one_sided_limits.mbx. I've also done manually editing to sec_derivatives.mbx that may lead to a merge conflict with the sin(x) changes here. And in #69 https://github.com/PCCMathSAC/apex-mbx/pull/69 David is doing a more universal attack on sin x and friends.

So any objection to closing this PR? Then #68 https://github.com/PCCMathSAC/apex-mbx/pull/68 can be merged. David can resubmit #69 https://github.com/PCCMathSAC/apex-mbx/pull/69 to avoid any conflicts with #68 https://github.com/PCCMathSAC/apex-mbx/pull/68. Then all that's left here is Changes_to_APEX.txt, which you could submit separately.

If this sounds OK, then I think you'd want to delete your dev branch and create a new one that doesn't have these four commits. Then create, add, and commit Changes_to_APEX.txt. To do the first part:

git checkout master git fetch origin git branch -D dev git checkout -b dev origin/master

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/PCCMathSAC/apex-mbx/pull/65#issuecomment-258076064, or mute the thread https://github.com/notifications/unsubscribe-auth/AGBt6ynqfHfwUTcrFNL8x_dRlxrkj1cMks5q6YkFgaJpZM4KdZHr .

Carly Vollet Mathematics Instructor Math Department Co-Chair Math Club Faculty Advisor PCC Cascade, SSB 321 971-722-5564

Carly Vollet Mathematics Instructor Math Department Co-Chair Math Club Faculty Advisor PCC Cascade, SSB 321 971-722-5564