Differences

This shows you the differences between two versions of the page.

--- analysis:course:week1 [2013/09/20 11:50]
jlocklin [For Linux users]
+++ analysis:course:week1 [2014/06/21 09:42]
mvdm [Setting up GitHub]
@@ Line 44: / Line 44: @@
 Important: the change you just made is limited to *your fork* only. The original repo that you forked is *not* automatically updated with your change! To remedy this, select "Pull Requests" on your repo site and choose "New Pull Request". The resulting page will show the diff of the file in your repo against the same file in the original repo, so it should highlight the change you made. Select "Click to create a Pull Request...", add a title, and click "Send Pull Request".
+<graphviz dot center>
+digraph G {
+  remote -> local [label="pull"];
+}
+</graphviz>
 Now, the owner of the original repo (in this case, ''mvdm'') will need to approve the request before the change is merged into the original repo. You will get a confirmation message by e-mail when this is done.
@@ Line 67: / Line 73: @@
 Use a FTP client such as [[https://filezilla-project.org/|Filezilla]] or ''WinSCP'' to connect to the lab FTP server, ''mvdmlab-nas1'' (129.97.62.84). Configure your FTP client to require "explicit FTP over TLS" and use ''BIOL680'' as username and password. In the ''BIOL680'' folder, download the folder ''R016-2012-10-08''. A good place to put this folder is in ''D:\data\promoted\R016\''. (In general you want to keep your data separate from your code; for instance, multiple analysis projects may use the same data, so you don't want to duplicate it.)
+Correct FileZilla configuration is the following:
+{{ :analysis:course:ftp_config.png?600 |}}
 You will have to be on campus to connect. If you still cannot log in to the server, send me your IP address and I will temporarily enable access for you. IF it still does not work, get the .zip {{:analysis:course:r016-2012-10-08.zip|here}}.
@@ Line 106: / Line 116: @@
-Follow the instructions above for Mac/OS X users, except you will have to recompile the binaries (note that you will probably need C and C++ compilers installed. Install the ''build-essential'' package on Ubuntu):
+Follow the instructions above for Mac/OS X users, except you may need to recompile the binaries (note that you will need C and C++ compilers installed. Install the ''build-essential'' package on Ubuntu):
   * You may want to just delete the existing binaries.
   * Edit ''compile.sh'' to set ''PLATFORM=64PC'' or ''PLATFORM=32PC'' depending on your architecture, and edit INCLMATLAB and BINMATLAB so that they point to the correct directories for your Matlab installation. If you don't remember, run ''locate mexsh'' in the shell and you should see the path.
@@ Line 120: / Line 130: @@
 === Be backup-aware ===
-If you are using a lab computer, only put data and code on the ''D:\'' drive. This actually has two underlying hard drives (a [[http://en.wikipedia.org/wiki/RAID#RAID_1|RAID 1 array]] in "mirroring" mode) such that if one fails, your data is still available. However, this does not protect accidentally deleting data, overwriting a key file, any sort of data corruption or damage, //et cetera//. Some options to minimize the impact of those:
+If you are using a lab computer, only put data and code on the ''D:\'' drive. This actually has two underlying hard drives (a [[http://en.wikipedia.org/wiki/RAID#RAID_1|RAID 1 array]] in "mirroring" mode) such that if one fails, your data is still available. However, this does not protect against accidentally deleting data, overwriting a key file, any sort of data corruption or damage, //et cetera//. Some options to minimize the impact of those:
   * Save your code (and other work that does not take up huge amounts of space) on Dropbox, Google Drive, or similar service that keeps a (limited) revision history

User Tools

Site Tools

Differences

Page Tools