diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json index 32960d6..029d0cb 100644 --- a/.obsidian/workspace.json +++ b/.obsidian/workspace.json @@ -321,12 +321,12 @@ "state": { "type": "markdown", "state": { - "file": "Pedigree Analysis.md", + "file": "biology/G11 Pre-AP Biology/Blood Types.md", "mode": "source", "source": false }, "icon": "lucide-file", - "title": "Pedigree Analysis" + "title": "Blood Types" } } ], @@ -498,27 +498,30 @@ }, "active": "56267c235596da5f", "lastOpenFiles": [ - "Pasted image 20261102104200.png", - "biology/G11 Pre-AP Biology/G11 Pre-AP Biology.md", - "Pedigree Analysis.md", - "biology/G11 Pre-AP Biology/Gregor Mendel and Monohybrid Cross.md", - "Blood Types.md", - "biology/G11 Pre-AP Biology/8 Levels of Biodiversity.md", - "Chi Squared.md", - "Pasted image 20261026103929.png", - "biology/G11 Pre-AP Biology/Other patterns of inheritance.md", + "biology/G11 Pre-AP Biology/Chi Squared.md", "biology/G11 Pre-AP Biology/Spermatogenesis and Oogenesis.md", - "biology/G11 Pre-AP Biology/Genetic Introduction.md", + "biology/G11 Pre-AP Biology/Other patterns of inheritance.md", "biology/G11 Pre-AP Biology/Mutations.md", - "Pasted image 20261019112757.png", - "Pasted image 20261019112113.png", + "biology/G11 Pre-AP Biology/Gregor Mendel and Monohybrid Cross.md", + "biology/G11 Pre-AP Biology/Genetic Introduction.md", + "biology/G11 Pre-AP Biology/Pedigree Analysis.md", + "Tasks.md", + "biology/G11 Pre-AP Biology/Blood Types.md", + "Assets/Pasted image 20261007221632.png", + "Assets/Pasted image 20261102105022.png", + "Assets/Pasted image 20261102104200.png", + "biology/G11 Pre-AP Biology/G11 Pre-AP Biology.md", + "biology/G11 Pre-AP Biology/8 Levels of Biodiversity.md", + "Assets/Pasted image 20261026103929.png", + "Assets/Pasted image 20261019112757.png", + "Assets/Pasted image 20261019112113.png", "literacy/fallacies.md", "biology/G11 Pre-AP Biology/12 Animalia.md", "biology/G11 Pre-AP Biology/10 Fungi.md", "physics/Force and Translational Dynamics/Spring Force.md", - "Pasted image 20261015104528.png", - "Pasted image 20261015104509.png", - "Pasted image 20261013105105.png", + "Assets/Pasted image 20261015104528.png", + "Assets/Pasted image 20261015104509.png", + "Assets/Pasted image 20261013105105.png", "physics/Force and Translational Dynamics/Forces and Freebody Diagrams.md", "physics/Force and Translational Dynamics/Force and Translational Dynamics.md", "physics/Force and Translational Dynamics/Conservation of Energy.md", @@ -530,10 +533,7 @@ "biology/G11 Pre-AP Biology/7 Species concepts and Evidence for Relatedness.md", "biology/G11 Pre-AP Biology/5 Classification (taxonomy) and Kingdoms.md", "biology/G11 Pre-AP Biology/8 Protista.md", - "Pasted image 20261007221643.png", - "Pasted image 20261007221632.png", - "Assets/Pasted image 20260929112116.png", - "Assets/Pasted image 20261001110549.png", + "Assets/Pasted image 20261007221643.png", "chemistry/Organic Chemistry", "physics/Modern Physics", "Excalidraw", diff --git a/Pasted image 20261007221632.png b/Assets/Pasted image 20261007221632.png similarity index 100% rename from Pasted image 20261007221632.png rename to Assets/Pasted image 20261007221632.png diff --git a/Pasted image 20261007221643.png b/Assets/Pasted image 20261007221643.png similarity index 100% rename from Pasted image 20261007221643.png rename to Assets/Pasted image 20261007221643.png diff --git a/Pasted image 20261013105105.png b/Assets/Pasted image 20261013105105.png similarity index 100% rename from Pasted image 20261013105105.png rename to Assets/Pasted image 20261013105105.png diff --git a/Pasted image 20261015104509.png b/Assets/Pasted image 20261015104509.png similarity index 100% rename from Pasted image 20261015104509.png rename to Assets/Pasted image 20261015104509.png diff --git a/Pasted image 20261015104528.png b/Assets/Pasted image 20261015104528.png similarity index 100% rename from Pasted image 20261015104528.png rename to Assets/Pasted image 20261015104528.png diff --git a/Pasted image 20261019112113.png b/Assets/Pasted image 20261019112113.png similarity index 100% rename from Pasted image 20261019112113.png rename to Assets/Pasted image 20261019112113.png diff --git a/Pasted image 20261019112757.png b/Assets/Pasted image 20261019112757.png similarity index 100% rename from Pasted image 20261019112757.png rename to Assets/Pasted image 20261019112757.png diff --git a/Pasted image 20261026103929.png b/Assets/Pasted image 20261026103929.png similarity index 100% rename from Pasted image 20261026103929.png rename to Assets/Pasted image 20261026103929.png diff --git a/Pasted image 20261102104200.png b/Assets/Pasted image 20261102104200.png similarity index 100% rename from Pasted image 20261102104200.png rename to Assets/Pasted image 20261102104200.png diff --git a/Assets/Pasted image 20261102105022.png b/Assets/Pasted image 20261102105022.png new file mode 100644 index 0000000..116b2f1 Binary files /dev/null and b/Assets/Pasted image 20261102105022.png differ diff --git a/Pedigree Analysis.md b/Pedigree Analysis.md deleted file mode 100644 index 2aa31f2..0000000 --- a/Pedigree Analysis.md +++ /dev/null @@ -1,5 +0,0 @@ -[[G11 Pre-AP Biology]] - -Pedigree is a diagram of family relationships. - -![[Pasted image 20261102104200.png]] \ No newline at end of file diff --git a/Tasks.md b/Tasks.md index 2f21648..b0efb30 100644 --- a/Tasks.md +++ b/Tasks.md @@ -1,6 +1,8 @@ stuff needed to be done -- [ ] print a robot arm -- [ ] write a scientific paper -- [ ] make a human brain model using c++ -- [ ] vulkan maybe? dont care too much for it -- [ ] unreal engine maybe? \ No newline at end of file +- [x] print a robot arm ✅ 2026-11-04 +~~- [ ] write a scientific paper~~ not happening +~~- [ ] make a human brain model using c++~~ +~~- [ ] vulkan maybe? dont care too much for it ~~ +~~- [ ] unreal engine maybe?~~ +- [ ] get a job +- [ ] rake in bands diff --git a/Blood Types.md b/biology/G11 Pre-AP Biology/Blood Types.md similarity index 97% rename from Blood Types.md rename to biology/G11 Pre-AP Biology/Blood Types.md index d9c47a2..eacd325 100644 --- a/Blood Types.md +++ b/biology/G11 Pre-AP Biology/Blood Types.md @@ -14,7 +14,7 @@ $i$ represents O blood. | B | $I^BI^B$
$I^Bi$ | | A antibodies. | | AB | $I^AI^B$ | | Neither A or B antibodies. | | O | $ii$ | | Both A and B antibodies. | -Blood carries antibodies against the protein markers that are not present on the red blood cells. Antibodies are responsible for clumping or agglutination of blood cells when incompatible blood groups are mixed. Agglutination can clog vessels, causing sever damage. Agglutination is good for an immune response. +Blood carries antibodies against the protein markers that are not present on the red blood cells. Antibodies are responsible for clumping or agglutination of blood cells when incompatible blood groups are mixed. Agglutination can clog vessels, causing severe damage. Agglutination is good for an immune response. Rhesus factor (Rh) determines if blood is plus or minus. It's another glycoprotein found on the red blood cell. diff --git a/Chi Squared.md b/biology/G11 Pre-AP Biology/Chi Squared.md similarity index 100% rename from Chi Squared.md rename to biology/G11 Pre-AP Biology/Chi Squared.md diff --git a/biology/G11 Pre-AP Biology/Pedigree Analysis.md b/biology/G11 Pre-AP Biology/Pedigree Analysis.md new file mode 100644 index 0000000..43260b9 --- /dev/null +++ b/biology/G11 Pre-AP Biology/Pedigree Analysis.md @@ -0,0 +1,30 @@ +[[G11 Pre-AP Biology]] + +Pedigree is a diagram of family relationships. + +![[Pasted image 20261102104200.png]] + +Example begin: +The trait we are examining is: +The mode of inheritance of this trait is: +Therefore, circles and squares that are filled in will represent: +Let T rep brown +Let t rep blue" +![[Pasted image 20261102105022.png]] +Example end. + +Example pedigree analysis begin: +Pedigree analysis: +- Let statements: + - If the trait is autosomal dominant then: + - A = Kidney disease + - a = No kidney disease + - Affected genotypes: AA, Aa. + - Unaffected genotypes: aa. +- Let statements: + - If the trait is autosomal recessive then: + - A = No cystic fibrosis. + - a = Cystic fibrosis. + - Affected genotypes: aa. + - Unaffected genotypes: Aa, AA. +Example end. \ No newline at end of file