Usually a basic discrete math course covers: naive set theory, formal logic, functions (khan covers under calc), relations, permutations and combinations (cover

Usually a basic discrete math course covers: naive set theory, formal logic, functions (khan covers under calc), relations, permutations and combinations (covered by khan),and graph theory. Additionally you'll usually do a lot of proofs with these since an understanding of how to do a proof is essential to being able to study algorithms. Calculus and the like are actually the dual of 'Discrete math', which could be referred to as 'Continuous math'