Skip to content

Jpchallenge1 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jpbida wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Jpchallenge1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9237f8
My solution to challenge1
Apr 26, 2012
d9d3f92
My solution
Apr 26, 2012
7a07145
Merged Sequences and Secondary Structures for challenge 2
Apr 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions challenges/challenge1/solutions/0001-My-solution-to-challenge1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From b9237f824ac7cafe697550d0fb635a4e7e90f9aa Mon Sep 17 00:00:00 2001
From: JP Bida <jpbida@comp1.local>
Date: Thu, 26 Apr 2012 10:44:52 -0700
Subject: [PATCH] My solution to challenge1

---
src/polymere.cpp | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/polymere.cpp b/src/polymere.cpp
index f230f39..42f0f12 100755
--- a/src/polymere.cpp
+++ b/src/polymere.cpp
@@ -1034,7 +1034,7 @@ delete pdb;
}

void Polymere::alignHelix(Polymere* p2,std::vector<int> helix1, std::vector<int> helix2){
-//Jp's attempt at a solution to challenge 1
+//Jp's attempt at a solution to challenge 1 and create a pull request
//helix1 matches the Polymere object calling alignHelix
//helix2 matches the p2 Polymere object

--
1.7.5.4

Loading