From Line #131
Merged
From Line #131
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
quizas211
commented
Oct 21, 2023
quizas211
commented
- Unified variable names & brackets
- Added some semi-trivial theorems in Line
- Added a theorem that still needs to be proved in Ray
- Added two theorems that still need to be proved in Colinear
- My local files can be compiled successfully
… 3. Added a theorem that still needs to be proved in Ray 3. Added a theorem that still needs to be proved in Colinear
… in Line 3. Added a theorem that still needs to be proved in Ray 3. Added a theorem that still needs to be proved in Colinear" This reverts commit 851516c.
…theorems in Line 3. Added a theorem that still needs to be proved in Ray 3. Added a theorem that still needs to be proved in Colinear"" This reverts commit ff67bab.
jjdishere
approved these changes
Oct 21, 2023
| @@ -9,15 +9,22 @@ section setoid | |||
|
|
|||
| variable {P : Type _} [EuclideanPlane P] | |||
|
|
|||
| def same_extn_line : Ray P → Ray P → Prop := fun r₁ r₂ => r₁.toProj = r₂.toProj ∧ (r₂.source LiesOn r₁ ∨ r₂.source LiesOn r₁.reverse) | |||
| def same_extn_line : Ray P → Ray P → Prop := fun r r' => r.toProj = r'.toProj ∧ (r'.source LiesOn r ∨ r'.source LiesOn r.reverse) | |||
There was a problem hiding this comment.
Thank you for your effort in making variables uniform！
|
|
||
| theorem pt_pt_lies_on_iff_seg_toLine {A B : P}{l : Line P}(h : B ≠ A) : A LiesOn l ∧ B LiesOn l ↔ (Seg_nd.mk A B h).toLine = l := by | ||
| constructor | ||
| · sorry |
There was a problem hiding this comment.
Still a sorry here to be filled
There was a problem hiding this comment.
Yes, I was way too spleepy yesterday.
| theorem maximal (l : Line P) {A B : P} (h₁ : A ∈ l.carrier) (h₂ : B ∈ l.carrier) (h : B ≠ A) : (∀ (C : P), colinear A B C → (C ∈ l.carrier)) := sorry | ||
| theorem maximal' {l : Line P} {A B : P} (h₁ : A LiesOn l) (h₂ : B LiesOn l) (h : B ≠ A) : (∀ (C : P), colinear A B C → (C LiesOn l)) := by | ||
| intro C Co | ||
| sorry |
There was a problem hiding this comment.
this theorem can be reforulate even better. we can move C，colinear A B C into hypothesis.
There was a problem hiding this comment.
This theorem was written by otheres. So our team didn't make changes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.