These are chat archives for uwhpsc-2016/uwhpsc-2016

9th
May 2016
Chris Swierczewski
@cswiercz
May 09 2016 23:03

Office Hours - Start

Wow. That was a lot of chat messages.
WalesJ
@WalesJ
May 09 2016 23:26
Hello! Not sure if you saw this in the issues page yet, but i was unable to pull the updates.
Chris Swierczewski
@cswiercz
May 09 2016 23:27
Which issue?
WalesJ
@WalesJ
May 09 2016 23:27
#5
Chris Swierczewski
@cswiercz
May 09 2016 23:28
Ah. I see your comment. Not sure why it didn't pop up in my notifications box.
How about I pop open your SMC project and we walk through this together in a terminal?
WalesJ
@WalesJ
May 09 2016 23:29
It happens. That's why I was checking on it.
Sounds good!
Chris Swierczewski
@cswiercz
May 09 2016 23:29
Opening your project right now. I'm going to use TerminalTest.term if you want to see what I'm doing.
WalesJ
@WalesJ
May 09 2016 23:29
Here
Chris Swierczewski
@cswiercz
May 09 2016 23:30
Let me know when you've opened TerminalTest
Ah. I see the problem. Well, I see a few.
hello
WalesJ
@WalesJ
May 09 2016 23:34
Back here
Chris Swierczewski
@cswiercz
May 09 2016 23:34
So there is a directory called homework3-WalesJ within your homework 3 directory homework3-WalesJ
I don't know why you have a clone within a clone.
WalesJ
@WalesJ
May 09 2016 23:34
I don't know how i even did that
Chris Swierczewski
@cswiercz
May 09 2016 23:34
That's okay.
If you haven't written anything in homework3-WalesJ/homework3-WalesJ then we should delete it.
I see you've modified homework3-WalesJ/src/integrate.c.
WalesJ
@WalesJ
May 09 2016 23:35
I just checked . I hadn't worked in that one
Chris Swierczewski
@cswiercz
May 09 2016 23:36
Excellent. Let's get rid of it because it can cause confusion.
WalesJ
@WalesJ
May 09 2016 23:36
I modified the first integrate.c not the nested one
Chris Swierczewski
@cswiercz
May 09 2016 23:36
perfect
going to delete it now.
WalesJ
@WalesJ
May 09 2016 23:36
Thank you!
Chris Swierczewski
@cswiercz
May 09 2016 23:36
There.
Now. Issue number two: look at the output of git remote -v
Both origin and upstream point to the same repo.
upstream should point to the "base" version: https://github.com/uwhpsc-2016/homework3.git
WalesJ
@WalesJ
May 09 2016 23:37
...I didn't even notice
Chris Swierczewski
@cswiercz
May 09 2016 23:37
That's okay. We'll just reset the url of upstream to the actual repo.
See what I'm doing? (Dirty secret: I don't have every single git command commited to memory.)
Thanks for the typo fix!
WalesJ
@WalesJ
May 09 2016 23:39
Should be fine now?
Chris Swierczewski
@cswiercz
May 09 2016 23:39
There we go! Now upstream points to the base repo where I push all the fixes.
Yep. Let's first temporarily commit your changes.
Now we will pull the changes from upstream
Looks like we have some merge conflicts. That's okay. Let's see what's wrong.
WalesJ
@WalesJ
May 09 2016 23:40
I'm on a tablet and a laptop switch whenever you need to. :)
Chris Swierczewski
@cswiercz
May 09 2016 23:41
Got it. According to the error message (which we'll take a close look at) there is a problem in integrate.h. I kind of expected this because:
1) I saw in a commit message that you already added documentation.
2) I had to fix the function prototype of something in integrate.h.
So let's open up integrate.h and see what needs to be fixed.
Woah. What's going on here...I'm going to use the SMC file browser, instead.
File open. Nice documentation!
WalesJ
@WalesJ
May 09 2016 23:43
Thank you!
Chris Swierczewski
@cswiercz
May 09 2016 23:43
Okay. So take a look at line 128
Git is indicating that the following code up to "=========" was the state of your code before the pull
Obviously, it contains your documentation.
The stuff below the "======" is the state of the code from the pull.
Finally, the ">>>>>>>" says where the possible conflicts end.
If you look closely (and read my own commit messages) you should see that the definition of time_simps_parallel_chunked has changed slightly.
WalesJ
@WalesJ
May 09 2016 23:45
Alright
Chris Swierczewski
@cswiercz
May 09 2016 23:45
and time_simps_parallel
(I forgot the repeat variables) Make sense so far?
WalesJ
@WalesJ
May 09 2016 23:46
Yes!
Chris Swierczewski
@cswiercz
May 09 2016 23:46
Great! So let's make sure that the state of the file uses the versions of these timing functions that we need. Namely, the ones with "repeat" in them. (You'll have to update your docstrings.)
There we go!
Any questions about that part?
WalesJ
@WalesJ
May 09 2016 23:48
Nope. I remember going over that in ckass
Class*
Chris Swierczewski
@cswiercz
May 09 2016 23:49
Great. One comment, though. Actually, a question for you: are we supposed to be changing the values stored at fvals?
WalesJ
@WalesJ
May 09 2016 23:51
I'm not sure I understand the question? Fvals shoukd
Should be the final output
So, no?
Chris Swierczewski
@cswiercz
May 09 2016 23:51
Well, not quite. fvals is just an input to the function. The purpose of trapz, for example, is to output a number representing the integral of the function values stored in fvals.
I'm taking a look at your integrate.c file now and I see there is a little bit of a confusion.
WalesJ
@WalesJ
May 09 2016 23:52
Ah, it's a really rough draft made at 3am. Haha
Chris Swierczewski
@cswiercz
May 09 2016 23:53
No worries. We'll cross that bridge later, then. Let's finish merging the homework 3 patches.
Back to the terminal....
integrate.h now contains the code from both your documentation changes as well as the updated function prototypes
There we go! Add, commit, and check the log.
You now have the patches.
WalesJ
@WalesJ
May 09 2016 23:55
Thank you!
Chris Swierczewski
@cswiercz
May 09 2016 23:55
Of course.
WalesJ
@WalesJ
May 09 2016 23:57
Now all the changes are on GitHub! Thanks again
Chris Swierczewski
@cswiercz
May 09 2016 23:57
Excellent.