Skip to content

Commit

Permalink
Merge branch 'refs/heads/main' into 2024-a-universal-language
Browse files Browse the repository at this point in the history
  • Loading branch information
FadiShawki committed Apr 7, 2024
2 parents dcf2d6d + a77427c commit 1dacde2
Show file tree
Hide file tree
Showing 11 changed files with 390 additions and 78 deletions.
2 changes: 1 addition & 1 deletion orbitmines.com/public/archive/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
<url>
<loc>https://orbitmines.com</loc>
<lastmod>2024-03-05</lastmod>
<lastmod>2024-04-01</lastmod>
<image:image>
<image:loc>https://orbitmines.com/logo.png</image:loc>
</image:image>
Expand Down
2 changes: 1 addition & 1 deletion orbitmines.com/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />

<meta name="theme-color" content="#000000" />
<meta name="description" content="OrbitMines Research"/>
<meta name="description" content="Once a Minecraft server, now a research project dedicated to understanding arbitrarily unknown dynamical systems."/>

<!-- See https://developers.google.com/web/fundamentals/web-app-manifest/ -->
<link rel="manifest" href="manifest.json" />
Expand Down
2 changes: 1 addition & 1 deletion orbitmines.com/public/papers/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
<url>
<loc>https://orbitmines.com</loc>
<lastmod>2024-03-05</lastmod>
<lastmod>2024-04-01</lastmod>
<image:image>
<image:loc>https://orbitmines.com/logo.png</image:loc>
</image:image>
Expand Down
4 changes: 2 additions & 2 deletions orbitmines.com/public/profiles/sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
<url>
<loc>https://orbitmines.com</loc>
<lastmod>2024-03-05</lastmod>
<lastmod>2024-04-01</lastmod>
<image:image>
<image:loc>https://orbitmines.com/logo.png</image:loc>
</image:image>
Expand All @@ -14,7 +14,7 @@
</url>
<url>
<loc>https://orbitmines.com/profiles/fadi-shawki</loc>
<lastmod>2024-03-05</lastmod>
<lastmod>2024-04-01</lastmod>
<image:image>
<image:loc>https://orbitmines.com/profiles/fadi-shawki.jpeg</image:loc>
</image:image>
Expand Down
16 changes: 16 additions & 0 deletions orbitmines.com/src/lib/organizations/ORGANIZATIONS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import akissinger_icon from "././akissinger/881183.png";
import wolfram_icon from "././wolfram-research/logo.png";
import all_in_icon from "././all-in/icon.jpeg";
import zx_calculus_icon from "././zx/icon.png";
import active_inference_institute_icon from "././active-inference-institute/channels4_profile.jpg";
import toe_icon from "././toe/toe.jpg";
import {Renderable} from "../typescript/React";
import {ReferenceProps} from "../paper/layout/Reference";

Expand Down Expand Up @@ -109,6 +111,20 @@ const ORGANIZATIONS = {
icon_png: orbitmines_icon,
},
},
toe: <TOrganization>{
key: 'toe',
name: "toe",
assets: {
icon_png: toe_icon,
}
},
active_inference_institute: <TOrganization>{
key: 'active_inference_institute',
name: "active_inference_institute",
assets: {
icon_png: active_inference_institute_icon,
}
},
all_in: <TOrganization>{
key: 'all_in',
name: "all_in",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added orbitmines.com/src/lib/organizations/toe/toe.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
285 changes: 269 additions & 16 deletions orbitmines.com/src/profiles/FadiShawki/FadiShawki.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion orbitmines.com/src/profiles/profiles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const PROFILES = {

picture: 'https://orbitmines.com/profiles/fadi-shawki/profile-picture.jpg',

date: '2024-03-05',
date: '2024-04-01',

email: 'fadi.shawki@orbitmines.com',

Expand Down
154 changes: 98 additions & 56 deletions orbitmines.com/src/routes/papers/2023.FadiShawki.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import {Intent, Tag} from "@blueprintjs/core";
import {
import REFERENCES, {
ARTICLES_2021,
ARTICLES_2022,
ARTICLES_2023,
ARTICLES_2024,
FAMILIAR_TOOLS
} from "../../profiles/FadiShawki/FadiShawki";
import ORGANIZATIONS from "../../lib/organizations/ORGANIZATIONS";
import ORGANIZATIONS, {Viewed} from "../../lib/organizations/ORGANIZATIONS";
import Section from "../../lib/paper/layout/Section";
import Arc from "../../lib/paper/layout/Arc";
import Link from '../../lib/paper/layout/Link';
Expand All @@ -25,33 +25,105 @@ const FadiShawki = () => {
const profile = PROFILES.fadi_shawki;

return <Profile profile={profile}>
<Arc head="Currently..." buffer={false}>
<Arc head={<span>
TGBG but the solution to TGBG is TGBG.🤔
</span>} buffer={false}>
{/*<Section head="Looking for a (Compiler, Chip, Language, ...)-(Research, Design)-related position">*/}
{/* Feel free to contact me on the socials specified above.*/}
{/*</Section>*/}
<Section head="Looking for funding, collaboration or anyone curious to learn more">
Feel free to contact me on the socials specified above.
</Section>
<Section head="Building a (ray-like) graphical interface: OrbitMines as a Game Project">
<CanvasContainer style={{height: '140px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/header.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
/>
</CanvasContainer>

<Link
link="https://github.com/orbitmines/orbitmines.com"
name={<span>
OrbitMines as a Game Project
</span>}
icon={ORGANIZATIONS.github.key} />

<CanvasContainer style={{height: '110px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/branch.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
/>
</CanvasContainer>

<Section head="Ongoing Projects">
<Category category={{
name: '2013 .. 2024',
items: [
_2024_02_ORBITMINES_AS_A_GAME_PROJECT,
{
reference: {
title: "Writing 2024. A Universal Language",
organizations: [ORGANIZATIONS.github],
year: "2024",
link: "https://github.com/orbitmines/orbitmines.com/pull/28"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - (Hypergraphic) Version Control System through Rays",
organizations: [ORGANIZATIONS.github],
year: "2024",
link: "https://github.com/orbitmines/archive/blob/main/projects/Project%20-%20(Hypergraphic)%20Version%20Control%20System%20through%20Rays%20(2024).md"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - Implementing Aleks Kissinger's Chyp (Cospans of HYPergraphs) through Rays",
organizations: [ORGANIZATIONS.github],
year: "2024",
link: "https://github.com/orbitmines/orbitmines.com/issues/14"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - Compute - Rays to GPUs",
organizations: [ORGANIZATIONS.github],
year: "2024?",
link: "https://github.com/orbitmines/archive/tree/main/projects#:~:text=Project%20%2D-,Compute%20(2024%3F)%20%2D%20Rays%20to%20GPUs.md,-Entries%20%3C%202024%2D03"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - Indexing existing Abstract Models",
organizations: [ORGANIZATIONS.github],
year: "2024-2025?",
link: "https://github.com/orbitmines/archive/blob/main/projects/Project%20-%20Indexing%20existing%20Abstract%20Models%20(2024-2025%3F).md"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - Compression (2025?)",
organizations: [ORGANIZATIONS.github],
year: "2025?",
link: "https://github.com/orbitmines/archive/blob/main/projects/Project%20-%20Compression%20(2025%3F).md"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
},
{
reference: {
title: "Project - Archive - \"OrbitMines' Journey\"",
organizations: [ORGANIZATIONS.github],
year: "2025-2026?",
link: "https://github.com/orbitmines/archive/blob/main/projects/Project%20-%20Archive%20-%20%22OrbitMines'%20Journey%22%20(2025-2026%3F).md"
}, status: Viewed.VIEWED, found_at: "2024", viewed_at: "2024"
}
]
}} focus={ContentFocus.ALL} />
</Section>

<CanvasContainer style={{height: '140px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/header.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
/>
</CanvasContainer>

{/*<Section head="Modelling WebAssembly">*/}
{/* <Link link="https://github.com/orbitmines/wasm" icon={ORGANIZATIONS.github.key} intent={Intent.DANGER} style={{textDecoration: 'line-through'}} />*/}

Expand All @@ -66,18 +138,6 @@ const FadiShawki = () => {
</Arc>


<CanvasContainer style={{height: '110px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/branch.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
/>
</CanvasContainer>

<Arc head="Writings" buffer={false}>
<Section head="Theoretics">
{[A_UNIVERSAL_LANGUAGE, _2024_02_ORBITMINES_AS_A_GAME_PROJECT, ON_ORBITS, ON_INTELLIGIBILITY].map((paper, i) => (
Expand All @@ -103,39 +163,21 @@ const FadiShawki = () => {
<Category category={profile.content!.history} focus={ContentFocus.FINISHED} />
</Section>

<Section head="Formal Education">
<Category category={profile.content!.formal_education} focus={ContentFocus.ALL} inline />
</Section>

<Section head="Attended Events">
<Category category={profile.content!.attended_events} focus={ContentFocus.ALL} />
</Section>
</Arc>

<CanvasContainer style={{height: '150px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/2_edge_3_fractal_with_equivs.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
/>
</CanvasContainer>

<Arc head="Technology Exposure" buffer={false}>
<Section head="2013 .. 2023">
<Category category={FAMILIAR_TOOLS} focus={ContentFocus.ALL} inline simple />
<Section head="Formal Education">
<Category category={profile.content!.formal_education} focus={ContentFocus.ALL} />
</Section>
</Arc>

<CanvasContainer style={{height: '110px'}}>
<CanvasContainer style={{height: '150px'}}>
<canvas
style={{
width: '100%',
height: '100%',
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/2_edge_3_fractal_equived.png')`,
backgroundImage: `url('/papers/on-orbits-equivalence-and-inconsistencies/images/2_edge_3_fractal_with_equivs.png')`,
backgroundPosition: 'center center',
backgroundRepeat: 'no-repeat'
}}
Expand Down
1 change: 1 addition & 0 deletions orbitmines.com/src/routes/papers/2023.OnOrbits.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ const OnOrbits = () => {
<span style={{textAlign: 'left', minWidth: '100%'}}>It begins with a slightly unusual way of (visual) thinking. Usually, when one wants to describe some <span
className="bp5-text-muted">single thing, node, vertex, ..., point</span>, this is done against some assumed background, to draw one's attention to that single thing.</span>


<BR/>

<Block>
Expand Down

0 comments on commit 1dacde2

Please sign in to comment.