summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJJ2024-03-17 20:26:54 +0000
committerJJ2024-03-17 20:26:54 +0000
commit93689618c67e8d6f5db9702097d614d3fbd1ab57 (patch)
tree79213faaddf49eec52b60307ab5f492fabf64d78
parent32b9ed9190261086953545465634ae1954f59dd3 (diff)
meow
-rw-r--r--404.html3
-rw-r--r--_layouts/linguistics.html2
-rw-r--r--ctf/index.md6
-rw-r--r--linguistics/semantics.md7
-rw-r--r--mathematics/algebra.md7
5 files changed, 15 insertions, 10 deletions
diff --git a/404.html b/404.html
index 6a4e9d3..ef198cd 100644
--- a/404.html
+++ b/404.html
@@ -14,9 +14,8 @@ title: 404
</nav>
</div>
</header>
-<main>
+<main style="text-align: center;">
<br>
<h2 style="margin: 20px;">404</h2>
<span>Page not found</span>
</main>
-
diff --git a/_layouts/linguistics.html b/_layouts/linguistics.html
index 97c21d1..15b2ffc 100644
--- a/_layouts/linguistics.html
+++ b/_layouts/linguistics.html
@@ -15,7 +15,7 @@ layout: default
<a href="/linguistics/glossary">glossary</a>
<a href="/linguistics/syntax">syntax</a>
<a href="/linguistics/semantics">semantics</a>
- <a href="/linguistics/types">types</a>
+ <a href="/linguistics/pragmatics">pragmatics</a>
</nav>
</div>
</header>
diff --git a/ctf/index.md b/ctf/index.md
index 5a5c15a..511a415 100644
--- a/ctf/index.md
+++ b/ctf/index.md
@@ -20,10 +20,10 @@ a list of past, present, and future ctfs can be found on [ctftime](https://ctfti
while competing in ctfs can be group work: practice is overwhelmingly a solo activity.
to get good at playing in ctfs, one must learn to be very comfortable learning on their own.
-<ul style="display: flex; flex-direction: row; justify-content: space-evenly; list-style: none;">
+<!-- <ul style="display: flex; flex-direction: row; justify-content: space-evenly; list-style: none;">
<li><h2><a href="crypto">crypto</a></h2></li>
<li><h2><a href="rev">rev</a></h2></li>
<li><h2><a href="pwn">pwn</a></h2></li>
<li><h2><a href="web">web</a></h2></li>
- <!-- <li><h2><a href="misc">misc</a></h2></li> -->
-</ul>
+ <li><h2><a href="misc">misc</a></h2></li>
+</ul> -->
diff --git a/linguistics/semantics.md b/linguistics/semantics.md
index 7615145..fc7feb2 100644
--- a/linguistics/semantics.md
+++ b/linguistics/semantics.md
@@ -11,3 +11,10 @@ How do we know what sentences are true and which are false?<br>
What does it *mean* for a sentence to be true?<br>
What conditions must hold for a sentence to be true?
+Formal semantics attempts to answer those questions by providing a *framework* for determining what *conditions* must hold for a sentence to be true.
+
+This framework is [first-order/predicate logic](../mathematics/logic) and the [simply-typed lambda calculus](../plt/lambda-calculus). On top of this, we often build set theory, relying on *characteristic functions* of the lambda calculus to denote *set membership*.
+
+
+## Resources
+- ✨ [Invitation to Formal Semantics](https://eecoppock.info/bootcamp/semantics-boot-camp.pdf)
diff --git a/mathematics/algebra.md b/mathematics/algebra.md
index 1da221b..0ba7847 100644
--- a/mathematics/algebra.md
+++ b/mathematics/algebra.md
@@ -5,8 +5,7 @@ title: mathematics/algebra
# algebra
-modern algebra is the study of **algebraic structures**: groups, rings, fields, modules, and the like.
-these structures are very abstract: and so results can be applied to a wide variety of situations.
+Modern algebra is the study of **algebraic structures**: groups, rings, fields, modules, and the like. These structures are very abstract: and so results can be applied to a wide variety of situations.
## structures
@@ -45,8 +44,8 @@ A **vector space** $V$ over a field $F$ of scalars is a set with a binary operat
- additive inverse: $∀v, ∃-v: v+(-v) = 0$
- commutativity: $∀u,v : u+v=v+u$
- $(V, )$ is a *scalar operation*:
- - scalar identity: $∃1 ∈ F : 1v = v1 = v$
- - commutativity: $∀a,b ∈ F, ∀v ∈ V (ab)v = a(bv)$
+ - scalar identity: $∃1 ∈ F, ∀v ∈ V : 1v = v1 = v$
+ - commutativity: $∀a,b ∈ F, ∀v ∈ V : (ab)v = a(bv)$
- The *distributive laws* hold:
- $∀a ∈ F, ∀u,v ∈ V : a(u+v) = au+av$
- $∀a,b ∈ F, ∀v ∈ V : (a+b)v = av + bv$